fixes based on feedback from team