Various fixes 4

In preparing for the webinar this Wednesday I'm sure I'll run into some bugs.  Collecting them here.
since `\w -> [A-Za-z0-9_]`