Config adjustments and additional config values, still needs A LOT of tweaking...