Feedback round

A grab bag of fixes and changes as requested from the most recent beta.  Best viewed by commit, chronological order.