Update comments. Add more logging.