Remove some TODOs in modules
Improve groundtruth reader