Modifications to sensor and equipment extensions

Based on the call today, I made a few modifications to these
extensions.  I’m committing now and will merge with Master.