Make temperature & pressure calculation code consistent with non-unified library.

Have merged in fixes to the older library and am merging those into the unified library to be consistent.  Verified changes with example output before and after change.