applying fixes based on feedback from project admin