fixed some bugs
tweaks
Merge branch 'master' of https://github.com/samatt/TBD