add more context for TODO comments