I will fix the TODOs in a separate issues/commits/