Minor changes. Implemented proper driver Close