fixed some TODOs