fancied up the makefile and tidied up the object files