Tweaked tools a bit, just to make me happy.