Add forgotten formatting. Add logging.