Lots more sound twiddling and fixing