various fixes in training and mercenaries