ok some fixes