Touching/removing/fixing many todos...