prepare for parser
minor changes