Kevin scenario tweaks

@AmbientOSX: scenario tweaks.
It throws a warning, but otherwise works fine.  I'm going to merge, then I'll look at fixing the sound driver tomorrow.