fourth round of fixes