update log messages, shift logic for gathering metadata out of peer logic