cleanup of todos including fix for configuration link