- Fixed duplicate message with diamond detector
- Added more info, checks, and decreased time-out length for update
checking.