Updated regex, some other stuff