Added concept of level generators
Boring fixups