finished some TODOs