Changed count increments and added some more docblocks