Various tweaks
Fixed conflicts