fixes after review for PR #179