Bit of work on small things. Cleaning up.