Bug fixes
New history stitching code