Could you add a comment explaining what your additions to this regex do? This is a pretty gnarly one now!