Solve all TODOs left out from the presentation stage.