Tweaked scripts and config