Fix tone manager issues and crash with a full refactoring.