more changes towards asyncio integration