fixed bugs, added AST walker