Integrating tokenize bracket expressions
other minor fixes