Class System Fixes

Fixes for the classes so they work on different years (and some more
added)