- minor fixes and improvements
