Tweaks and analysis