more minore tidy ups