Count -> Increment, added in setup.py
Fixed up namespace issues, added in commenting