Performance Improvements and Minor Enhancements