Updating regex to catch a few more.