Fixed some stuff and did an AST test