Update To-do-List and Bugs to Fix