Added a few more debugging features.