cleanup & updated todo list