Various tweaks to audio playback, fix sorting headers