fixed a crap ton of stuff
fixed conflict