add linkify and improve regex matching