Added Calipers functionality and fixed PtStComp bug.