Minor Changes and Improvements.