Added audio, expanded controls