bugfixes and extended client support