some updates & bug fix