Minor Changes

Minor changes and fixes