fix 'Drain' keyword and add todo for unlimited blocking