fixes based on reviewers' feedback