inbetween some changes but asked to pull so I'll comment better later
fixed conflicts