mark some TODOs