Refactoring.
More tweaks.
Fixed ThreadPoolDownloadService.
Fixed a race condition.
Added grading drivers.
Merge remote-tracking branch 'upstream/master'