Merge Christoph's fixes to cell offsets, wavefunction saving, and missing interimWave call.