Fixed formatting
Updated TODO list