Minor Adjustments/Improvements