Fixed some default counter bugs; bit of refactoring in bin