MOST Update to the newest generator version + minor corrections.

It's best to review this PR commit-by-commit.