integrated zero-point into calinration process.  fixed some bugs