Added some debug info etc.