fix the remaining minor nits