various tidyups