a few small changes with latest code
First batch of Nils ch 5 edits