misc tidies from field