All regex's are greedy

There was an issue where the regex's weren't greedy. Has been changed.