Tidying some things up

(not working atm, but i have to sync)