Fixed bug, added todo list