#97 & #139 - Working on adding additional debug code and fix attempts to resolve these issues