Various refactoring.
Minor audio implementations.