finished html

Pull request from Andrea for the finished_html branch.