pluralization fix and padding fix