fixes based on feedback