multiple bugfixes.