changed some comments
Added some tests
Added some more minor tests