some regex tweaks