makefile and polishing up