added wait timeouts
added deletion of download directory
minor updated on highlight utils.