ADT Companion and OECSM Bug Fixes and Enhancements

Made various minor enhancements mainly to the adt_companion and oecsm modules. See specific commits for details.