Minor stuff
Merge origin/master
Minor changes - plus full table calibration