More driver loading work; minor tweaks