some fixes again