diff --git a/docs/.vitepress/config.ts b/docs/.vitepress/config.ts
index 14727da..bd2806d 100644
--- a/docs/.vitepress/config.ts
+++ b/docs/.vitepress/config.ts
@@ -6,15 +6,10 @@ export default defineConfig({
 	title: "Svitore",
 	description: "State manager",
 	themeConfig: {
-		nav: [
-			{ text: "Home", link: "/" },
-			{ text: "Examples", link: "/markdown-examples" },
-		],
+		nav: [{ text: "Home", link: "/" }],
 
 		sidebar: [
 			{ text: "Get Started", link: "/getting-started" },
-			{ text: "Markdown Examples", link: "/markdown-examples" },
-			{ text: "Runtime API Examples", link: "/api-examples" },
 			{
 				text: "Entities",
 				items: [
diff --git a/docs/api-examples.md b/docs/api-examples.md
deleted file mode 100644
index 691df9c..0000000
--- a/docs/api-examples.md
+++ /dev/null
@@ -1,55 +0,0 @@
----
-outline: deep
----
-
-# Runtime API Examples
-
-This page demonstrates usage of some of the runtime APIs provided by VitePress.
-
-The main `useData()` API can be used to access site, theme, and page data for the current page. It works in both `.md` and `.vue` files:
-
-```md
-<script setup>
-import { useData } from 'vitepress'
-
-const { theme, page, frontmatter } = useData()
-</script>
-
-## Results
-
-### Theme Data
-
-<pre>{{ theme }}</pre>
-
-### Page Data
-
-<pre>{{ page }}</pre>
-
-### Page Frontmatter
-
-<pre>{{ frontmatter }}</pre>
-```
-
-<script setup>
-import { useData } from 'vitepress'
-
-const { site, theme, page, frontmatter } = useData()
-</script>
-
-## Results
-
-### Theme Data
-
-<pre>{{ theme }}</pre>
-
-### Page Data
-
-<pre>{{ page }}</pre>
-
-### Page Frontmatter
-
-<pre>{{ frontmatter }}</pre>
-
-## More
-
-Check out the documentation for the [full list of runtime APIs](https://vitepress.dev/reference/runtime-api#usedata).
diff --git a/docs/markdown-examples.md b/docs/markdown-examples.md
deleted file mode 100644
index 3ea9aa9..0000000
--- a/docs/markdown-examples.md
+++ /dev/null
@@ -1,85 +0,0 @@
-# Markdown Extension Examples
-
-This page demonstrates some of the built-in markdown extensions provided by VitePress.
-
-## Syntax Highlighting
-
-VitePress provides Syntax Highlighting powered by [Shikiji](https://github.com/antfu/shikiji), with additional features like line-highlighting:
-
-**Input**
-
-````md
-```js{4}
-export default {
-  data () {
-    return {
-      msg: 'Highlighted!'
-    }
-  }
-}
-```
-````
-
-**Output**
-
-```js{4}
-export default {
-  data () {
-    return {
-      msg: 'Highlighted!'
-    }
-  }
-}
-```
-
-## Custom Containers
-
-**Input**
-
-```md
-::: info
-This is an info box.
-:::
-
-::: tip
-This is a tip.
-:::
-
-::: warning
-This is a warning.
-:::
-
-::: danger
-This is a dangerous warning.
-:::
-
-::: details
-This is a details block.
-:::
-```
-
-**Output**
-
-::: info
-This is an info box.
-:::
-
-::: tip
-This is a tip.
-:::
-
-::: warning
-This is a warning.
-:::
-
-::: danger
-This is a dangerous warning.
-:::
-
-::: details
-This is a details block.
-:::
-
-## More
-
-Check out the documentation for the [full list of markdown extensions](https://vitepress.dev/guide/markdown).
diff --git a/src/entities/effect-runner.ts b/src/entities/effect-runner.ts
index e0f2fdf..39833da 100644
--- a/src/entities/effect-runner.ts
+++ b/src/entities/effect-runner.ts
@@ -111,10 +111,10 @@ class EffectRunner<
 	}
 
 	release(): void {
+		this.stop();
 		this.pending.release();
 		this.changed.release();
 		super.release();
-		this.stop();
 	}
 }
 
diff --git a/src/entities/services/abstract-event.ts b/src/entities/services/abstract-event.ts
index fb1a7a1..42af5fa 100644
--- a/src/entities/services/abstract-event.ts
+++ b/src/entities/services/abstract-event.ts
@@ -66,6 +66,11 @@ abstract class AbstractEvent<Payload = void> extends Entity<Payload> {
 			this.dispatch(selector ? selector(payload) : payload);
 		});
 	}
+
+	release(): void {
+		this.middlewares = [];
+		super.release();
+	}
 }
 
 export { AbstractEvent };
diff --git a/src/entities/services/delayed-event.ts b/src/entities/services/delayed-event.ts
index ec16dc3..12e5a0a 100644
--- a/src/entities/services/delayed-event.ts
+++ b/src/entities/services/delayed-event.ts
@@ -13,6 +13,7 @@ abstract class DelayedEvent<Payload = void> extends AbstractEvent<Payload> {
 	}
 
 	release(): void {
+		this.pending = false;
 		this.clearTimer();
 		super.release();
 	}
diff --git a/src/entities/state.ts b/src/entities/state.ts
index 2846d60..db4c866 100644
--- a/src/entities/state.ts
+++ b/src/entities/state.ts
@@ -12,14 +12,16 @@ class State<Data> extends AbstractState<Data> {
 	changeOn<Payload extends Data>(event: Event<Payload>): this;
 	changeOn<Payload>(
 		event: Event<Payload>,
-		selector: (payload: Payload, state: Data) => Data
+		selector: (payload: Payload, state: Data, prevState: Data) => Data
 	): this;
 	changeOn(
 		event: Event<any>,
-		selector?: (payload: any, state: Data) => Data
+		selector?: (payload: any, state: Data, prevState: Data) => Data
 	): this {
 		return this.trigger(event, (payload) => {
-			this.notify(selector ? selector(payload, this.get()) : payload);
+			this.notify(
+				selector ? selector(payload, this.get(), this.getPrev()) : payload
+			);
 		});
 	}