correct pluralization and some other fixes