Minor Fixes, Possible Performance Upgrade