Added comments framework
Comments in place
Fixed some issues with the tests