Some additional tweaks and config