Added 3 bugs that need fixing to the TODO list