Small updates to some comments and some debug code