More regex updates yay