fix some gen info
some cleaning