one last round of fixes