fixed several Form names and comments in code