some minor enhancements - aborting thread does not work as expected!