diff --git a/src/checks/y_check_num_exec_statements.clas.abap b/src/checks/y_check_num_exec_statements.clas.abap
index f539b688..b30b35e3 100644
--- a/src/checks/y_check_num_exec_statements.clas.abap
+++ b/src/checks/y_check_num_exec_statements.clas.abap
@@ -52,7 +52,7 @@ CLASS Y_CHECK_NUM_EXEC_STATEMENTS IMPLEMENTATION.
 
     add_obj_type( c_type_program ).
 
-    set_check_message( '&1 executable statements in method, exceeds threshold &2' ).
+    set_check_message( '&1 executable statements in method reaching threshold of &2' ).
   ENDMETHOD.
 
 
diff --git a/src/checks/y_check_num_output_parameter.clas.abap b/src/checks/y_check_num_output_parameter.clas.abap
index 6b3d56a5..13e58087 100644
--- a/src/checks/y_check_num_output_parameter.clas.abap
+++ b/src/checks/y_check_num_output_parameter.clas.abap
@@ -21,7 +21,7 @@ CLASS Y_CHECK_NUM_OUTPUT_PARAMETER IMPLEMENTATION.
     settings-threshold = 2.
     settings-documentation = |{ c_docs_path-checks }number-output-parameter.md|.
 
-    set_check_message( 'Too many output parameters!' ).
+    set_check_message( '&1 output parameters reaching threshold of &2' ).
   ENDMETHOD.
 
 
@@ -67,7 +67,9 @@ CLASS Y_CHECK_NUM_OUTPUT_PARAMETER IMPLEMENTATION.
     raise_error( statement_level     = statement-level
                  statement_index     = index
                  statement_from      = statement-from + 1
-                 error_priority      = configuration-prio ).
+                 error_priority      = configuration-prio
+                 parameter_01        = |{ outputs_of_statement }|
+                 parameter_02        = |{ configuration-threshold }| ).
 
   ENDMETHOD.
 
diff --git a/src/checks/y_check_num_public_attributes.clas.abap b/src/checks/y_check_num_public_attributes.clas.abap
index b7aae8ae..f9a7868a 100644
--- a/src/checks/y_check_num_public_attributes.clas.abap
+++ b/src/checks/y_check_num_public_attributes.clas.abap
@@ -83,7 +83,7 @@ CLASS Y_CHECK_NUM_PUBLIC_ATTRIBUTES IMPLEMENTATION.
     settings-threshold = 1.
     settings-documentation = |{ c_docs_path-checks }number-public-attributes.md|.
 
-    set_check_message( '&1 public attributes. All attributes should be private by default.' ).
+    set_check_message( '&1 public attributes. All attributes should be private/protected by default.' ).
   ENDMETHOD.
 
 
diff --git a/src/checks/y_check_number_attributes.clas.abap b/src/checks/y_check_number_attributes.clas.abap
index b03b1fc9..ba94c3cf 100644
--- a/src/checks/y_check_number_attributes.clas.abap
+++ b/src/checks/y_check_number_attributes.clas.abap
@@ -77,7 +77,7 @@ CLASS Y_CHECK_NUMBER_ATTRIBUTES IMPLEMENTATION.
     settings-threshold = 12.
     settings-documentation = |{ c_docs_path-checks }number-attributes.md|.
 
-    set_check_message( '&1 attributes, exceeding threshold &2' ).
+    set_check_message( '&1 attributes reaching threshold of &2' ).
   ENDMETHOD.
 
 
diff --git a/src/checks/y_check_number_events.clas.abap b/src/checks/y_check_number_events.clas.abap
index b2e31589..7f124697 100644
--- a/src/checks/y_check_number_events.clas.abap
+++ b/src/checks/y_check_number_events.clas.abap
@@ -45,7 +45,7 @@ CLASS Y_CHECK_NUMBER_EVENTS IMPLEMENTATION.
     settings-pseudo_comment = '"#EC NUMBER_EVENTS' ##NO_TEXT.
     settings-documentation = |{ c_docs_path-checks }number-events.md|.
 
-    set_check_message( 'There are &1 events, exceeding threshold of &2' ).
+    set_check_message( '&1 events reaching threshold of &2' ).
   ENDMETHOD.
 
 
diff --git a/src/checks/y_check_number_interfaces.clas.abap b/src/checks/y_check_number_interfaces.clas.abap
index 03aaf6c9..1d91dfb6 100644
--- a/src/checks/y_check_number_interfaces.clas.abap
+++ b/src/checks/y_check_number_interfaces.clas.abap
@@ -47,7 +47,7 @@ CLASS Y_CHECK_NUMBER_INTERFACES IMPLEMENTATION.
     settings-threshold = 4.
     settings-documentation = |{ c_docs_path-checks }number-interfaces.md|.
 
-    set_check_message( 'There are &1 interfaces, exceeding threshold of &2' ).
+    set_check_message( '&1 interfaces reaching threshold of &2' ).
   ENDMETHOD.
 
 
diff --git a/src/checks/y_check_number_methods.clas.abap b/src/checks/y_check_number_methods.clas.abap
index 7255754a..8a551bed 100644
--- a/src/checks/y_check_number_methods.clas.abap
+++ b/src/checks/y_check_number_methods.clas.abap
@@ -49,7 +49,7 @@ CLASS Y_CHECK_NUMBER_METHODS IMPLEMENTATION.
     settings-threshold = 20.
     settings-documentation = |{ c_docs_path-checks }number-methods.md|.
 
-    set_check_message( '&1 methods, exceeding threshold of &2' ).
+    set_check_message( '&1 methods reaching threshold of &2' ).
   ENDMETHOD.