added improved support for capture
starting support for parsing char classes