little improvement & bug fix