last round of fixes?