Bug Fixes

Finally fixed the tableView bug.  Good time to stop before lunch.