various fixes and improvements
build