Update and sanitise a little bit.