Fixed breaking sound and other clean up.