Added results table and solved a couple of TODOs.