A couple of quick fixes
Tweaks and formatting stuff
Cleaned up accessories
Merge branch 'master' into gh-pages