Significant refactoring, improvement of comment-doc quality, more refactoring, more comments. More refactoring.