another iteration of fixes