more stuff
moar
bunch of changes