some fixes probably