corrections

I've made a few corrections; please consider them for merge.