apply fixes from @ali-graham's feedback on PR #94