Improving the async operation, other bug fixes