more stuff
fixes