Plural handling, some minor changes.