improved parsing of plural forms