Polish pass 8/21

@kadst43 Fixes a number of small punchlist items from Juan's email.
I'm not sure what lines these are, but I would recommend making a separate block with the delay in the conditional.  If you do it this way, the lines may fire even if the scenario has ended (or they may not - I've never tested).