final round of fixes