clean up makefile a bit (not tested at oxford... hopefully won't break anything)