#7

Major bugfixes in class generator.