Added nanny; bug fix warrior