fixed some issues with the way classes had been broken up