Updated minor Sound todo's