Squashed a bug

Also updated debug info