diff --git a/README.md b/README.md
index 9282cca..fce81a8 100644
--- a/README.md
+++ b/README.md
@@ -1,38 +1,166 @@
- 
+ 
+# Media over QUIC (MoQ) Player
+
Media over QUIC (MoQ) is a live media delivery protocol utilizing QUIC streams.
See the [MoQ working group](https://datatracker.ietf.org/wg/moq/about/) for more information.
-This repository contains the a web library for MoQ.
-It uses the browser APIs such as WebTransport and WebCodecs to support both contribution and distribution.
-Check out [quic.video](https://quic.video) for a demo or [run it locally](https://github.com/kixelated/quic.video) as a UI.
+This repository provides a **web library for MoQ**. It uses browser APIs such as **WebTransport** and **WebCodecs** to support both contribution and distribution over MoQ.
+
+> **Note**: This library currently focuses on the **client side**. You’ll need a MoQ server or relay, such as [moq-rs](https://github.com/englishm/moq-rs) (for local usage).
+
+This library offers **two main approaches** to playing MoQ streams in a browser:
-This is a client only.
-You'll either need to run a local server using [moq-rs](https://github.com/kixelated/moq-rs) or use a public server such as [relay.quic.video](https://quic.video/relay).
+1. **Web Component** – `` with simple built-in controls.
+2. **Simple Player** – A `Player` class that handles rendering and playback logic without built-in UI.
-Join the [Discord](https://discord.gg/FCYF3p99mr) for updates and discussion.
+---
-## Setup
+## Installation
-Install the dependencies with `npm`:
+Install the library from npm:
```bash
-npm install
+npm install moq-player
+```
+
+Or include via a `
+```
+
+## Usage
+
+### Web Component: ``
+
+```html
+
```
+The built-in controls are basic. If you want more advanced controls or custom styling, see the [Styling & Media Chrome](#styling--media-chrome) section or our samples.
+
+### Simple Player
+
+If you’d prefer to implement your own UI or integrate the player logic differently, use the class-based Player:
+
+```javascript
+import { Player } from "moq-player";
+
+async function initPlayer() {
+ const canvas = document.getElementById("my-canvas");
+ const player = await Player.create({
+ url: "https://example.com/my-moq-stream",
+ fingerprint: "https://example.com/fingerprint",
+ namespace: "demo",
+ canvas,
+ });
+
+ player.play();
+ // Implement your own play/pause buttons, volume sliders, etc.
+}
+```
+
+## Events
+
+Both the Web Component and the Class-Based Player emit a series of events to help track playback state:
+
+- `play`
+- `pause`
+- `loadeddata`
+- `volumechange`
+- `unsubscribestared`
+- `unsubscribedone`
+- `subscribestared`
+- `subscribedone`
+- `waitingforkeyframe`
+- `timeupdate`
+
+You can listen to these events in the usual way. For example:
+
+```javascript
+const videoMoq = document.querySelector("video-moq");
+videoMoq.addEventListener("play", () => {
+ console.log("Playback started!");
+});
+```
+
+See `samples/event-handling` for complete examples.
+
+## Styling & Media Chrome
+
+When using the `` element, you can style it in various ways:
+
+- **Media Chrome:** Integrate `` inside a `` and use ``, ``, and other controls. See `samples/media-chrome` for an example.
+
+```html
+
+
+
+
+
+
+
+
+```
+
+- **player.style:** You can also use custom themes from [player.style](https://player.style/) to style the player. See `samples/media-chrome` for a working example.
+
+```html
+
+
+
+
+```
+
+## Samples
+
+The `samples/` directory demonstrates:
+
+- **Web Component Basic** – A simple `` usage.
+- **Web Component Advanced** – Using the component as an ES module.
+- **Media Chrome** – Integrating `` with [player.style](https://player.style/) custom themes.
+- **Simple Player** – Using the class-based Player without built-in controls.
+- **Event Handling** – Listening for playback and subscription events in detail.
+
## Development
-Run the development web server:
+- Install dependencies
+
+```
+npm install
+```
+
+- Run the dev server for local testing:
```bash
npm run dev
```
+In [localhost:3000](http://localhost:3000/) you will have the samples running.
+
## License
Licensed under either:
-- Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0)
-- MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)
+- Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0)
+- MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)
+
+## Community & Support
+
+- Join our [Discord](https://discord.gg/FCYF3p99mr) for updates and discussion.
+- File issues or suggestions via GitHub Issues.
+- Pull requests are welcome!
diff --git a/lib/README.md b/lib/README.md
index 45f079e..cf51dda 100644
--- a/lib/README.md
+++ b/lib/README.md
@@ -1,156 +1,39 @@
-
-
-
-
-# Media over QUIC (MoQ) Player
+# Media over QUIC
Media over QUIC (MoQ) is a live media delivery protocol utilizing QUIC streams.
-See the [MoQ working group](https://datatracker.ietf.org/wg/moq/about/) for more information.
-
-This repository provides a **web library for MoQ**. It uses browser APIs such as **WebTransport** and **WebCodecs** to support both contribution and distribution over MoQ.
-
-> **Note**: This library currently focuses on the **client side**. You’ll need a MoQ server or relay, such as [moq-rs](https://github.com/englishm/moq-rs) (for local usage), to stream live content.
-
-This library offers **two main approaches** to playing MoQ streams in a browser:
-
-1. **Web Component** – `` with simple built-in controls.
-2. **Simple Player** – A `Player` class that handles rendering and playback logic without built-in UI.
+See the [Warp draft](https://datatracker.ietf.org/doc/draft-lcurley-warp/).
----
+## Install
-## Installation
+To install dependencies:
-Install the library from npm:
-
-```bash
-npm install moq-player
```
-
-Or include via a `
-```
-
-## Usage
-
-### Web Component: ``
-
-```html
-
-```
-
-The built-in controls are basic. If you want more advanced controls or custom styling, see the [Styling & Media Chrome](#styling--media-chrome) section or our samples.
-
-### Simple Player
-
-If you’d prefer to implement your own UI or integrate the player logic differently, use the class-based Player:
-
-```javascript
-import { Player } from "moq-player"
-
-async function initPlayer() {
- const canvas = document.getElementById("my-canvas")
- const player = await Player.create({
- url: "https://example.com/my-moq-stream",
- fingerprint: "https://example.com/fingerprint",
- namespace: "demo",
- canvas,
- })
-
- player.play()
- // Implement your own play/pause buttons, volume sliders, etc.
-}
-```
-
-## Events
-
-Both the Web Component and the Class-Based Player emit a series of events to help track playback state:
-
-- `play`
-- `pause`
-- `loadeddata`
-- `volumechange`
-- `unsubscribestared`
-- `unsubscribedone`
-- `subscribestared`
-- `subscribedone`
-- `waitingforkeyframe`
-- `timeupdate`
-
-You can listen to these events in the usual way. For example:
-
-```javascript
-const videoMoq = document.querySelector("video-moq")
-videoMoq.addEventListener("play", () => {
- console.log("Playback started!")
-})
+npm install
```
-See `samples/event-handling` for complete examples.
-
-## Styling & Media Chrome
-
-When using the `` element, you can style it in various ways:
+## Build
-- **Media Chrome:** Integrate `` inside a `` and use ``, ``, and other controls. See `samples/media-chrome` for an example.
+To generate the builds:
-```html
-
-
-
-
-
-
-
-
```
-
-- **player.style:** You can also use custom themes from [player.style](https://player.style/) to style the player. See `samples/media-chrome` for a working example.
-
-```html
-
-
-
-
+npm run build
```
-## Samples
-
-The `samples/` directory demonstrates:
+Generated builds:
-- **Web Component Basic** – A simple `` usage.
-- **Web Component Advanced** – Using the component as an ES module.
-- **Media Chrome** – Integrating `` with [player.style](https://player.style/) custom themes.
-- **Simple Player** – Using the class-based Player without built-in controls.
-- **Event Handling** – Listening for playback and subscription events in detail.
+- **IIFE:** `dist/moq-player.iife.js` & `dist/moq-simple-player.iife.js` – for direct browser usage via `