Fix all remaining bugs. New class system now works!