v0.21

Fix and restructure calibration code, improve documentation