More summary improvements; bug fix