add summary, plus minor cleanup