changes for 0.91.4

Mostly more regexp fixes.