parse tree bug fixes