Further improvement & bug fixes