made some minor changes to makefile etc..