Abbreviate methods in classes
Fix interfaces for classes

Also some untested fixes for enums