fix to todos