done some minor change