Added some debug features.