Fix regex and some links