Tweaks and a bad commit message