fixing pluralization everywhere