some fixes!