lexer changes to support percent removal
working without percents