More cleanups
Handle additionals at least half-correctly, bring MakeDriver up to speed. Closes #545. Closes #566