fixed more stuff
fixed merge