Fixed stuff in Modified Generator