Did some stuff here and there
Fixed merge