1. Modified the bug in saving the setting 
2. Modified the bug in saving the calibration data