Bugs uncovered in testing

Added some major (blocker) bugs to the TODO list