Added to_html method to Passage, few other cleanups