Changes made to count and a few trivial changes