Run autocorrect. Solved several TODOs. Added two more.