added tag support and link highlighting