removed some flags in makefile
prettied up the imports etc