Tweaking, fixing and merging