naming conventions
code cleanup
fix merge conflicts and dial in some good calibration numbers