- fixing generate
- maybe some other things