next round of fixes