Tweaks based on mjallday's comments