Minor fixes
partial partial
Merge branch 'master' of github.com:puffball/freebeer
merging minor-bugs