some fixes and improvements
make