API formatting changes, adding debugger messages