Added some new classes, fixed some logical issues