minor improvements and bugfixes, mostly relating to the async feature