Added proper html to text transformer

And other small stuff