Various changes
Tweaked some settings