Make correct classes, clean up some errors.