diff --git a/addons/arsenal/functions/fnc_addRightPanelButton.sqf b/addons/arsenal/functions/fnc_addRightPanelButton.sqf
index 7d4ecd0d98..332f2453aa 100644
--- a/addons/arsenal/functions/fnc_addRightPanelButton.sqf
+++ b/addons/arsenal/functions/fnc_addRightPanelButton.sqf
@@ -7,9 +7,9 @@
  *
  * Arguments:
  * 0: items only misc items <ARRAY of STRING>
- * 1: tooltip <STRING> (Optional)
- * 2: picture path <STRING> (Optional)
- * 3: override a specific button (0-9) <NUMBER> (Optional)
+ * 1: tooltip <STRING> (default: "")
+ * 2: picture path <STRING> (default: QPATHTOF(data\iconCustom.paa))
+ * 3: override a specific button (0-9) <NUMBER> (default: -1)
  *
  * Return Value:
  * successful: number of the slot (0-9); error: -1 <NUMBER>
diff --git a/addons/common/functions/fnc_getFiremodeIndex.sqf b/addons/common/functions/fnc_getFiremodeIndex.sqf
index 20c04bc69f..647b444dc3 100644
--- a/addons/common/functions/fnc_getFiremodeIndex.sqf
+++ b/addons/common/functions/fnc_getFiremodeIndex.sqf
@@ -5,8 +5,8 @@
  *
  * Arguments:
  * 0: Unit <OBJECT>
- * 1: Muzzle <STRING> (Optional)
- * 2: Firemode <STRING> (Optional)
+ * 1: Muzzle <STRING> (default: current weapon muzzle)
+ * 2: Firemode <STRING> (default: current weapon fire mode)
  *
  * Return Value:
  * Weapon/Mode index <NUMBER>
@@ -18,14 +18,14 @@
  */
 
 params ["_unit"];
-(weaponState _unit) params ["", "_currentMuzzle", "_currentFiremode"]; 
+(weaponState _unit) params ["", "_currentMuzzle", "_currentFiremode"];
 params ["", ["_muzzle", _currentMuzzle], ["_firemode", _currentFireMode]];
 
-private _weapons = _unit weaponsInfo [_muzzle, false]; 
-private _index = -1; 
+private _weapons = _unit weaponsInfo [_muzzle, false];
+private _index = -1;
 {
     _x params ["_xIndex", "", "", "", "_xFiremode"];
-    if (_xFiremode == _firemode) exitWith { _index = _xIndex; }; 
+    if (_xFiremode == _firemode) exitWith { _index = _xIndex; };
 } forEach _weapons;
 
 _index
diff --git a/addons/common/functions/fnc_numberToDigits.sqf b/addons/common/functions/fnc_numberToDigits.sqf
index e4da7a6b43..d6a0249f86 100644
--- a/addons/common/functions/fnc_numberToDigits.sqf
+++ b/addons/common/functions/fnc_numberToDigits.sqf
@@ -5,7 +5,7 @@
  *
  * Arguments:
  * 0: Number to 'digitize' <NUMBER>
- * 1: Set the minimal length of the returned array. Useful for getting left hand zeroes. <NUMBER> (optional)
+ * 1: Set the minimal length of the returned array. Useful for getting left hand zeroes. <NUMBER> (default: 1)
  *
  * Return Value:
  * Digits. The maximum count is six digits. <ARRAY>
@@ -16,7 +16,7 @@
  * Public: Yes
  */
 
-params ["_number", "_minLength"];
+params ["_number", ["_minLength", 1]];
 
 _number = [_number min 999999, _minLength] call CBA_fnc_formatNumber;
 
diff --git a/addons/interact_menu/functions/fnc_createAction.sqf b/addons/interact_menu/functions/fnc_createAction.sqf
index 428f8a26d7..07aa6d5fee 100644
--- a/addons/interact_menu/functions/fnc_createAction.sqf
+++ b/addons/interact_menu/functions/fnc_createAction.sqf
@@ -10,12 +10,12 @@
  * 2: Icon file path or Array of icon file path and hex color ("" for default icon) <STRING|ARRAY>
  * 3: Statement <CODE>
  * 4: Condition <CODE>
- * 5: Insert children code <CODE> (Optional)
- * 6: Action parameters <ANY> (Optional)
- * 7: Position (Position array, Position code or Selection Name) <ARRAY>, <CODE> or <STRING> (Optional)
- * 8: Distance <NUMBER> (Optional)
- * 9: Other parameters [showDisabled,enableInside,canCollapse,runOnHover,doNotCheckLOS] <ARRAY> (Optional)
- * 10: Modifier function <CODE> (Optional)
+ * 5: Insert children code <CODE> (default: {})
+ * 6: Action parameters <ANY> (default: [])
+ * 7: Position (Position array, Position code or Selection Name) <ARRAY>, <CODE> or <STRING> (default: {[0, 0, 0]})
+ * 8: Distance <NUMBER> (default: 2)
+ * 9: Other parameters [showDisabled,enableInside,canCollapse,runOnHover,doNotCheckLOS] <ARRAY> (default: all false)
+ * 10: Modifier function <CODE> (default: {})
  *
  * Return Value:
  * Action <ARRAY>
diff --git a/addons/rearm/functions/fnc_disable.sqf b/addons/rearm/functions/fnc_disable.sqf
index ee99746916..051d2fc9c9 100644
--- a/addons/rearm/functions/fnc_disable.sqf
+++ b/addons/rearm/functions/fnc_disable.sqf
@@ -5,7 +5,7 @@
  *
  * Arguments:
  * 0: Vehicle <OBJECT>
- * 1: Disable <BOOL> (optional)
+ * 1: Disable <BOOL> (default: true)
  *
  * Return Value:
  * None
diff --git a/addons/tagging/functions/fnc_addCustomTag.sqf b/addons/tagging/functions/fnc_addCustomTag.sqf
index 4de0fc016c..84a407e2dd 100644
--- a/addons/tagging/functions/fnc_addCustomTag.sqf
+++ b/addons/tagging/functions/fnc_addCustomTag.sqf
@@ -9,8 +9,8 @@
  * 2: Required Item <STRING>
  * 3: Textures Paths <ARRAY>
  * 4: Icon Path <STRING> (default: "")
- * 5: Material Paths <ARRAY> (optional)
- * 6: Tag Model <STRING> (optional)
+ * 5: Material Paths <ARRAY> (default: [])
+ * 6: Tag Model <STRING> (default: "UserTexture1m_F")
  *
  * Return Value:
  * Sucessfully Added Tag <BOOL>
diff --git a/addons/tagging/functions/fnc_tag.sqf b/addons/tagging/functions/fnc_tag.sqf
index ce31e2360e..5544a50f69 100644
--- a/addons/tagging/functions/fnc_tag.sqf
+++ b/addons/tagging/functions/fnc_tag.sqf
@@ -6,8 +6,8 @@
  * Arguments:
  * 0: Unit <OBJECT>
  * 1: The colour of the tag (valid colours are black, red, green and blue or full path to custom texture) <STRING>
- * 2: Material of the tag <STRING> (Optional)
- * 3: Tag Model <STRING> (optional)
+ * 2: Material of the tag <STRING> (default: "")
+ * 3: Tag Model <STRING> (default: "UserTexture1m_F")
  *
  * Return Value:
  * Sucess <BOOL>
diff --git a/docs/tools/document_functions.py b/docs/tools/document_functions.py
index 65f6017e76..5febaae446 100644
--- a/docs/tools/document_functions.py
+++ b/docs/tools/document_functions.py
@@ -161,7 +161,7 @@ class FunctionFile:
 
         arguments = []
         for argument in lines:
-            valid = re.match(r"^(\d+):\s(.+?)\<([\s\w,\|]+?)\>( \([Oo]ptional\))?(\s\(default: (.+)\))?$", argument)
+            valid = re.match(r"^(\d+):\s(.+?)\<([\s\w,\|]+?)\>( )?(\s\(default: (.+)\))?$", argument)
 
             if valid:
                 arg_index = valid.group(1)