various little tidyups