more debugging changes