Fix a couple of bugs.
Minor styling changes.
Merge branch 'master' into gh-pages