fixes for recent comments on PR #20