Fix moves history engine, clean-up