more stuff
fixing up of stuff