updates to model generator
more updates