Spacing fixes, and SET is needed with conditional.