new analyzer & bug fix