touchups from last merge