Bit's and bobs tidied up.