Changed some string checking to account for unicode.