More sprucing

Minor tweaks to when, action, looper.