improved pluralization, continuation of #2049