fixes from feedback

Feedback fixes