Tweaks completed