various bits of tidying up
For basement