more stuff
fixed merge