T6: fix audio and some cleanup