Minor Adjustments and Enhancements