some fixes ii