Fix some bugs.
Merge branch 'master' of github.com:godgunman/bumbler_to_count