Updated usage statements
Added a todo list