fix incorrect version handling
code clean up
removed alternative reset method in favor of version incrementing