Simple changes to debug output and comments.