added a bunch of things
Update regex