Music & sound + hierarchy fixes