Added some bugs to the TODO list