added collected todos
reviewed todos