Lots of small changes for debugging.