Corrected some things
Added some things into the TODO list