drop regexp escaping, string tokens clarified and minor LP fixes