* Added a couple of TODO's
* eliminated some TODO's
* Cleaned up a test