some fixes'