Changed some regex to try and catch more.