Corrected scheme names and included extra TODOs