Cleaned up melee damage and armor a bit