Config tweaks, still tweaking.
Reverts some shit. Was unnecessary.