added link support; fixed escaped content