Config tweaks
Cleanup