Consolidated Classes, Fixed various bugs