last round of fixes for today