Updated readme and minor generator edits