testing & bug fixes