views > hits, pluralization fixes
Merge changes from remote