Cleaned up formatting to be consistant across all classes.
Fixed some warnings and unchecked generics
Also moved knife to correct dir (Had to override, sorry Eury)