continue improving the AST, part 2