use moses scripts in engine, minor fixes