Fixed class checking and worked on class choosing restrictions