improve matching using non-greedy regex. Now matching everything.