pluralization bugfixes