more wording changes
more comments, refactoring