renamed stuff and removed TODOs