Fixed a small error and updated todo list