Added & updated log messages for consistency