Made a bunch of corrections
fixed conflicts hopefully