Removing warnings, adding TODOs.