Added summary label. Various cleanup