Done with some more stuff
fixed merge