Working on comments and some associated refactoring
More comments
Working on comments/docs and some associated cleanup