multiple bugfixes