Added audio stream select + code tidy up.