fixed minor issues
Merge branch 'rewrite' of github.com:postmodern/badger into rewrite