Tweak plural functions

More efficient and accuracy, similar functionality