Cursory changes to regexps

Also affects messages, needs testing.