continued commenting and debug