fixes based on feedback.