made more comparisons be case insensitive