some fixes-