some minor improvements

some minor improvements