bugfixes on client