New regex + tweaks