ast fixes
parse more