Adding tweaks from bag night
Fixed merge conflicts