Feedback fixes from Devon