done some correct