Variable types updated to reflect last commit's TODOs