misc tidies from field
Merge pull request #1123 from ahgittin/fix/misc

misc tidies from the field