added a character class
comments, tidying