more semantics and some outline conclusions
Merge branch 'master' into gh-pages