Improved character classes..