continued final edits
Merge branch 'master' of https://github.com/lvann/tb1