Fixing/expanding TODO