Minor changes; added couple TODOs.