Paper: finish/remove some TODOs