more instance vars fixed