Improved debugging stuff. Fixed bug where dashes are left in.