minor fixes/tidies