Various improvements to summarizer