-Work on punishment system
-Minor bugfixes