Some cleanup and debug object (d) added.