More logging, comments.