done some fixes