further lavida regex fixes
ugh