AST fixes

Now includes the block num in AST