cleans up a little bit + adds support for non dotnet (visa) drivers