additional tweaks to hem watch service