blished on --.


* inor fixes and performance improvements