updating, cleaning up, added a todo list