Renamed generator model + Misc edits and corrections