Fixed answer/completion logging.
Merging