first round of fixes to review