some fixes two