fixes based on PR comments