Optimization In Drivers part. Small Bug Fixes.