combining engine into the junqi environment, and cleaning things up a bit