Fixing pluralization & spelling