Minor readme changes and generator refactor

Just a little cleanup