replaced TODOs with short but complete descriptions

Per Martin's suggestion I removed the TODO placeholders and instead inserted short but complete descriptions of the components.