some more minor touchups