Fix equipment error
Update message
Unit change
Merge branch 'leon'