Add new music, latest changes.
Change sounds. Fix scholar text.
Merge branch 'robert'