another round of fixes