done some minor changes