Updated the HTML wrappers
Updated docs