some bugfixes && more work on async_client