- minor fixes and improvements