fixed AST printing and removed TODO's in code