Small changes
Some diagnostic additions