several todos have been resolved