replaced TODOs with short but complete descriptions