Fixed strangness in Cli#attack and fixed yaml files