Add more debugging and benchmarking statements