Multiple decision attributes now work and general driver cleanup