Tweaks after final run through