many-many-many-fixes and some changes into makefile