fixes from PR feedback