a lot of refactoring, consolidatign duplicated info in templates, a bunch of copy edits. More fixes for #125 (contrary to my previous comment in this issue, this shoud be the last big push before review