Fixed warnings, re-enabled soundtrack
Air meter
Merge