[MRG] get_limits and wait improvements