Added a few items to the TODO-list.