Bugfix + Indentation fixes

:super now refers to the superclass in the context where the method was
defined, even if it was defined in a superclass