Lot's of updates to address Bruce's comments and edits.