Prevent a missing super call.
Various improvements for #123

still some major discrepancy