style improvements
poor tracy
moar tracey and makefiles