More touchups, hopefully final