Updated forms, various miscellaneous edits and style tweaks per Doug