rearrange simple_sweep a bit and add cal button