Comments & Cleanup
Comments & Cleanup Part II
Change unit-test framework to xUnit fix #9