better regex

it works goodly now