cleaned up todos, set up save ordering