fix parser entry point
fix execution engine