Music added (only for music module testing). Some improvements.