Moved a couple tasks from todo to wishlist.