Added Driver manager
Fixed function parameters
Fixed typo
Refactoring