Merged in audio, updated motech version