Polish pass 8/21

@kadst43 Fixes a number of small punchlist items from Juan's email.
Will do!