Fixing up some bugs with code gen and the FormGen comment option.

Also, minor changes to notes.