Comment fixes
Separated raw and calibrated data
Sync of test code