Fixed draw bug
Added a todo list