corrections per PR comments