Add some TODOs
Add more AST APIs, clean up