Bugtested and improved the character class