Fixed logic and message

Fixed logic for adding “s” and fixed message capitalization after
testing.