More regex additions/fixes

most additions/deletions in the diff are because of 4 spaces to tab