Tweaks after review