more regexp improvements...
optmized markup treatment