Added pluralizations/singluars, fixed typo, switched to case-insensitive matching where applicable