Lots of fixes (from shared gdoc spreadsheet)