Minor Improvements

·