Added a few moar fun stuff