fixes suggestions from PR