bugfix and cleanup.
Merge branch 'recoursive-classes' into working