Improved new classes and found and corrected their many bugs