second round of fixes