Added summary; other fixes; ready for PR