More minor fixes
Use published generator system
0.1.0