tidy up, change loads of things, dont explain why