Feedback round 2

Lots of feedback and updates.