i dunno changed some stuff
more merging