changes to calibation stuff

Change-Id: I3e05619b3f532b008d8b7b0d167df241ce8721ba