fixed some regex to simplify to \w