Fixes lots and lots of class errors