diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4766d12d..6580505e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,21 @@
+## [4.0.0-alpha.236](https://github.com/godot-escoria/escoria-demo-game/compare/v0.0.0...v4.0.0-alpha.236) (2022-12-04)
+
+
+### Features
+
+* adds additional options to dialog manager, including a left-click action option and a text skipping option ([d676e50](https://github.com/godot-escoria/escoria-demo-game/commit/d676e50284ac5747e81bc15872eb69195905edb0))
+* adds option to sync talking animation finishing with either audio or text; if with text, now finishes when text is done rendering. ([13a6005](https://github.com/godot-escoria/escoria-demo-game/commit/13a600598f427d7a86e39590596fc747c4702b7d))
+* adds warnings w/ defaults when using settings; uses same calculation basis for text speeds/times; changes time units to ms ([f64b596](https://github.com/godot-escoria/escoria-demo-game/commit/f64b59621d52837dd27c4956b16959f8e197b871))
+* allows for the skipping of dialogue after the text is fully visible; still need to look at integrating with user options ([bd2f282](https://github.com/godot-escoria/escoria-demo-game/commit/bd2f28214b5b18e25b8e6a2a7de49752b68b40f5))
+
+
+### Bug Fixes
+
+* prevents illegal WPM values and uses default in those cases. ([e441414](https://github.com/godot-escoria/escoria-demo-game/commit/e4414141cb35e2534cce7a3d9f8f64ac9cbc31b7))
+* Trimmed audio files ([3e93fd3](https://github.com/godot-escoria/escoria-demo-game/commit/3e93fd31c61c9d29eadd3270ec2205cdaef8ea54))
+
+
+
 ## [4.0.0-alpha.235](https://github.com/godot-escoria/escoria-demo-game/compare/v0.0.0...v4.0.0-alpha.235) (2022-12-04)
 
 
diff --git a/addons/escoria-core/patterns/state_machine/state_machine.gd b/addons/escoria-core/patterns/state_machine/state_machine.gd
index 13ff0757..949e6e7e 100644
--- a/addons/escoria-core/patterns/state_machine/state_machine.gd
+++ b/addons/escoria-core/patterns/state_machine/state_machine.gd
@@ -14,7 +14,7 @@ signal state_changed(current_state)
 """
 You must set a starting node from the inspector or on
 the node that inherits from this state machine interface
-If you don't the game will crash (on purpose, so you won't 
+If you don't the game will crash (on purpose, so you won't
 forget to initialize the state machine)
 """
 export(NodePath) var START_STATE
@@ -64,7 +64,7 @@ func _change_state(state_name):
 		return
 
 	escoria.logger.trace(
-		self, 
+		self,
 		"Dialog State Machine: Changing state from '%s' to '%s'." % [current_state_name, state_name]
 	)
 
diff --git a/addons/escoria-dialog-simple/plugin.gd b/addons/escoria-dialog-simple/plugin.gd
index 389c8407..c10ac186 100644
--- a/addons/escoria-dialog-simple/plugin.gd
+++ b/addons/escoria-dialog-simple/plugin.gd
@@ -74,7 +74,7 @@ func disable_plugin():
 	ESCProjectSettingsManager.remove_setting(
 		LEFT_CLICK_ACTION
 	)
-	
+
 	ESCProjectSettingsManager.remove_setting(
 		STOP_TALKING_ANIMATION_ON
 	)
diff --git a/addons/escoria-dialog-simple/types/avatar.gd b/addons/escoria-dialog-simple/types/avatar.gd
index e4e11578..ebd87ef5 100644
--- a/addons/escoria-dialog-simple/types/avatar.gd
+++ b/addons/escoria-dialog-simple/types/avatar.gd
@@ -49,13 +49,13 @@ func _ready():
 	_text_time_per_character = ProjectSettings.get_setting(
 		SimpleDialogPlugin.TEXT_TIME_PER_LETTER_MS
 	)
-	
+
 	if _text_time_per_character < 0:
 		escoria.logger.warn(
 			self,
 			"%s setting must be a non-negative number. Will use default value of %s." %
 				[
-					SimpleDialogPlugin.TEXT_TIME_PER_LETTER_MS, 
+					SimpleDialogPlugin.TEXT_TIME_PER_LETTER_MS,
 					SimpleDialogPlugin.TEXT_TIME_PER_LETTER_MS_DEFAULT_VALUE
 				]
 		)
@@ -71,7 +71,7 @@ func _ready():
 			self,
 			"%s setting must be a non-negative number. Will use default value of %s." %
 				[
-					SimpleDialogPlugin.TEXT_TIME_PER_LETTER_MS_FAST, 
+					SimpleDialogPlugin.TEXT_TIME_PER_LETTER_MS_FAST,
 					SimpleDialogPlugin.TEXT_TIME_PER_LETTER_MS_FAST_DEFAULT_VALUE
 				]
 		)
@@ -87,7 +87,7 @@ func _ready():
 			self,
 			"%s setting must be a positive number. Will use default value of %s." %
 				[
-					SimpleDialogPlugin.READING_SPEED_IN_WPM, 
+					SimpleDialogPlugin.READING_SPEED_IN_WPM,
 					SimpleDialogPlugin.READING_SPEED_IN_WPM_DEFAULT_VALUE
 				]
 		)
diff --git a/addons/escoria-dialog-simple/types/floating.gd b/addons/escoria-dialog-simple/types/floating.gd
index c1adf6bf..cd00d1c4 100644
--- a/addons/escoria-dialog-simple/types/floating.gd
+++ b/addons/escoria-dialog-simple/types/floating.gd
@@ -48,13 +48,13 @@ func _ready():
 	_text_time_per_character = ProjectSettings.get_setting(
 		SimpleDialogPlugin.TEXT_TIME_PER_LETTER_MS
 	)
-	
+
 	if _text_time_per_character < 0:
 		escoria.logger.warn(
 			self,
 			"%s setting must be a non-negative number. Will use default value of %s." %
 				[
-					SimpleDialogPlugin.TEXT_TIME_PER_LETTER_MS, 
+					SimpleDialogPlugin.TEXT_TIME_PER_LETTER_MS,
 					SimpleDialogPlugin.TEXT_TIME_PER_LETTER_MS_DEFAULT_VALUE
 				]
 		)
@@ -70,7 +70,7 @@ func _ready():
 			self,
 			"%s setting must be a non-negative number. Will use default value of %s." %
 				[
-					SimpleDialogPlugin.TEXT_TIME_PER_LETTER_MS_FAST, 
+					SimpleDialogPlugin.TEXT_TIME_PER_LETTER_MS_FAST,
 					SimpleDialogPlugin.TEXT_TIME_PER_LETTER_MS_FAST_DEFAULT_VALUE
 				]
 		)
@@ -86,7 +86,7 @@ func _ready():
 			self,
 			"%s setting must be a positive number. Will use default value of %s." %
 				[
-					SimpleDialogPlugin.READING_SPEED_IN_WPM, 
+					SimpleDialogPlugin.READING_SPEED_IN_WPM,
 					SimpleDialogPlugin.READING_SPEED_IN_WPM_DEFAULT_VALUE
 				]
 		)