create more TODO: items to resolve before the release