improvements in parser
build index