spoke too soon; add some missing THENs and fix some comments