A few changes: cleanup to audio api, etc