New AST fixes

I've tried to strip out the new features here, and just leave the things that seem important for the new release. How does this look?