Move TODO items to their own file, and other minor edits.