some log messages + Master maintainability