Merged and cleaned regarding chip-rotation reconstruction.