- M3 upgrades...
- Some improvements on .stg templates