Some bug fixes stemming from merge that fixes some of the failing tests.  Updating
TODO list.