minor changes, further testing
Merge branch 'master' of github.com:strangesast/scoreboard