[misc] Added a few TODOs, improved a few comments
Issue #847: Improve the performance of the data tables
Done.