0.4.3 Snapshot 22

Playing with SPIRIT1, trying to optimize calibrator and other features