cleaning up, need to rethink the audio/video drivers before I start using them.