Bug and Todo list update
Revert "Bug and Todo list update"

This reverts commit d21107c5c43050494be90bf4f02f040d7494b56c.
Bugs and Todo List