loads of changes

crap commit comment