Another fix to regexps
Still not happy with regexps
Think I finally nailed it.