Add more debug info... #2