minor change in template
Corrections and reviews all over the place
merge