Some improvements whilst I'm at it.