Added music tracks. Small code cleanup. Fixed warnings and static analysis issues.