fixing some TODOs