a few more minor touchups