Bug fixes, improvements on damage and moves