cleaned up Wait/Watch api instead of adding another Updates method. also fixes the race with bringCurrent