Beefing up the watch command