regex additions/fixes