General updates. Added type => 'html' for raw html elements.