Add a little more debug chatter and Fix #97.