Fix most of what's wrong with the mixer...  Still a few bugs to squash,
but the success of this feature branch is now imminent...
Enough fixes to merge the mixer branch (but still more TODOs left...)