Worked a little on getting functions straightened out in parse tree