Added some comments, fixed some spacing, cleaned up some tests, added a
test or two