Updates to analyzer and parser

more in line to work with test files now