First round of fixes from latest feedback.