some fixes to the tbs server
Merge branch 'master' of github.com:frogatto/frogatto