fixed various bugs within the watch activity and service.