made an inprovement on generators
Bug fixes and Improvements