Fix broken channel layout
Fix typo
Improve channel map setting
Fix typo
Correct error message
Merge branch 'surround' into sdt