continuing to add log statements and refactoring classes
Merge branch '1.3.5'