some minor changes & bug fixes