Tweaks to everything