AST Completed
Bug Fixes in AST