Normalised text handling.  Factored tokens.  Added charter support.  Some cleanups