multiple bugfixes for last 2 commits