Renamed some classes, fixed more bugs