Improved debugging slightly