more conclusion stuff and other small additions
merged maggie stuff