E1S1: tweaked dialog, renamed macro