Tweaks and comments for future debugging.