minor improvements

Minor improvements