DID some TODOs in the report, added general remarks about the implementation