Minor fixes
Add entity subgenerator
First cut at entity