diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 70fe6fb5..43d9ea56 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -11,7 +11,6 @@ repos:
       hooks:
           - id: check-builtin-literals
           - id: check-case-conflict
-          - id: check-docstring-first
           - id: check-executables-have-shebangs
           - id: check-json
             exclude: tsconfig\.json
diff --git a/core/src/stdlib/pyscript.js b/core/src/stdlib/pyscript.js
index fcac6257..840212eb 100644
--- a/core/src/stdlib/pyscript.js
+++ b/core/src/stdlib/pyscript.js
@@ -1,19 +1,19 @@
 // ⚠️ This file is an artifact: DO NOT MODIFY
 export default {
   "pyscript": {
-    "__init__.py": "from polyscript import lazy_py_modules as py_import\nfrom pyscript.magic_js import RUNNING_IN_WORKER,PyWorker,config,current_target,document,js_import,js_modules,sync,window\nfrom pyscript.display import HTML,display\nfrom pyscript.fetch import fetch\nfrom pyscript.storage import Storage,storage\nfrom pyscript.websocket import WebSocket\nfrom pyscript.events import when,Event\nif not RUNNING_IN_WORKER:from pyscript.workers import create_named_worker,workers",
-    "display.py": "_K='_repr_mimebundle_'\n_J='image/svg+xml'\n_I='application/json'\n_H='__repr__'\n_G='savefig'\n_F='text/html'\n_E='image/jpeg'\n_D='application/javascript'\n_C='utf-8'\n_B='text/plain'\n_A='image/png'\nimport base64,html,io,re\nfrom pyscript.magic_js import current_target,document,window\nfrom pyscript.ffi import is_none\n_MIME_METHODS={_G:_A,'_repr_javascript_':_D,'_repr_json_':_I,'_repr_latex':'text/latex','_repr_png_':_A,'_repr_jpeg_':_E,'_repr_pdf_':'application/pdf','_repr_svg_':_J,'_repr_markdown_':'text/markdown','_repr_html_':_F,_H:_B}\ndef _render_image(mime,value,meta):\n\tA=value\n\tif isinstance(A,bytes):A=base64.b64encode(A).decode(_C)\n\tB=re.compile('^([A-Za-z0-9+/]{4})*([A-Za-z0-9+/]{3}=|[A-Za-z0-9+/]{2}==)?$')\n\tif len(A)>0 and not B.match(A):A=base64.b64encode(A.encode(_C)).decode(_C)\n\tC=f\"data:{mime};charset=utf-8;base64,{A}\";D=' '.join(['{k}=\"{v}\"'for(A,B)in meta.items()]);return f'<img src=\"{C}\" {D}></img>'\ndef _identity(value,meta):return value\n_MIME_RENDERERS={_B:html.escape,_F:_identity,_A:lambda value,meta:_render_image(_A,value,meta),_E:lambda value,meta:_render_image(_E,value,meta),_J:_identity,_I:_identity,_D:lambda value,meta:f\"<script>{value}<\\\\/script>\"}\nclass HTML:\n\tdef __init__(A,html):A._html=html\n\tdef _repr_html_(A):return A._html\ndef _eval_formatter(obj,print_method):\n\tB=obj;A=print_method\n\tif A==_H:return repr(B)\n\tif hasattr(B,A):\n\t\tif A==_G:C=io.BytesIO();B.savefig(C,format='png');C.seek(0);return base64.b64encode(C.read()).decode(_C)\n\t\treturn getattr(B,A)()\n\tif A==_K:return{},{}\ndef _format_mime(obj):\n\tC=obj\n\tif isinstance(C,str):return html.escape(C),_B\n\tD=_eval_formatter(C,_K)\n\tif isinstance(D,tuple):E,I=D\n\telse:E=D\n\tA,F=None,[]\n\tfor(H,B)in _MIME_METHODS.items():\n\t\tif B in E:A=E[B]\n\t\telse:A=_eval_formatter(C,H)\n\t\tif is_none(A):continue\n\t\tif B not in _MIME_RENDERERS:F.append(B);continue\n\t\tbreak\n\tif is_none(A):\n\t\tif F:window.console.warn(f\"Rendered object requested unavailable MIME renderers: {F}\")\n\t\tA=repr(A);B=_B\n\telif isinstance(A,tuple):A,G=A\n\telse:G={}\n\treturn _MIME_RENDERERS[B](A,G),B\ndef _write(element,value,append=False):\n\tB=element;C,D=_format_mime(value)\n\tif C=='\\\\n':return\n\tif append:A=document.createElement('div');B.append(A)\n\telse:\n\t\tA=B.lastElementChild\n\t\tif is_none(A):A=B\n\tif D in(_D,_F):E=document.createRange().createContextualFragment(C);A.append(E)\n\telse:A.innerHTML=C\ndef display(*E,target=None,append=True):\n\tD=append;A=target\n\tif is_none(A):A=current_target()\n\telif not isinstance(A,str):C=f\"target must be str or None, not {A.__class__.__name__}\";raise TypeError(C)\n\telif A=='':C='Cannot have an empty target';raise ValueError(C)\n\telif A.startswith('#'):A=A[1:]\n\tB=document.getElementById(A)\n\tif is_none(B):C=f\"Invalid selector with id={A}. Cannot be found in the page.\";raise ValueError(C)\n\tif B.tagName=='SCRIPT'and hasattr(B,'target'):B=B.target\n\tfor F in E:\n\t\tif not D:B.replaceChildren()\n\t\t_write(B,F,append=D)",
-    "events.py": "import asyncio,inspect,sys\nfrom functools import wraps\nfrom pyscript.magic_js import document\nfrom pyscript.ffi import create_proxy\nfrom pyscript.util import is_awaitable\nfrom pyscript import config\nclass Event:\n\tdef __init__(A):A._listeners=[]\n\tdef trigger(C,result):\n\t\tB=result\n\t\tfor A in C._listeners:\n\t\t\tif is_awaitable(A):asyncio.create_task(A(B))\n\t\t\telse:A(B)\n\tdef add_listener(B,listener):\n\t\tA=listener\n\t\tif is_awaitable(A)or callable(A):\n\t\t\tif A not in B._listeners:B._listeners.append(A)\n\t\telse:C='Listener must be callable or awaitable.';raise ValueError(C)\n\tdef remove_listener(A,*B):\n\t\tif B:\n\t\t\tfor C in B:A._listeners.remove(C)\n\t\telse:A._listeners=[]\ndef when(target,*B,**D):\n\tG='handler';C=target;E=None\n\tif B and(callable(B[0])or is_awaitable(B[0])):E=B[0]\n\telif callable(D.get(G))or is_awaitable(D.get(G)):E=D.pop(G)\n\tif isinstance(C,str):\n\t\tA=B[0]if B else D.pop('selector')\n\t\tif not A:I='No selector provided.';raise ValueError(I)\n\t\tfrom pyscript.web import Element as J,ElementCollection as K\n\t\tif isinstance(A,str):F=document.querySelectorAll(A)\n\t\telif isinstance(A,J):F=[A._dom_element]\n\t\telif isinstance(A,K):F=[A._dom_element for A in A]\n\t\telse:F=A if isinstance(A,list)else[A]\n\tdef H(func):\n\t\tB=func;D=inspect.signature(B)\n\t\tif D.parameters:\n\t\t\tif is_awaitable(B):\n\t\t\t\tasync def A(event):return await B(event)\n\t\t\telse:A=B\n\t\telif is_awaitable(B):\n\t\t\tasync def A(*A,**C):return await B()\n\t\telse:\n\t\t\tdef A(*A,**C):return B()\n\t\tA=wraps(B)(A)\n\t\tif isinstance(C,Event):C.add_listener(A)\n\t\telif isinstance(C,list)and all(isinstance(A,Event)for A in C):\n\t\t\tfor E in C:E.add_listener(A)\n\t\telse:\n\t\t\tfor G in F:G.addEventListener(C,create_proxy(A))\n\t\treturn A\n\treturn H(E)if E else H",
-    "fetch.py": "import json,js\nfrom pyscript.util import as_bytearray\nclass _Response:\n\tdef __init__(A,response):A._response=response\n\tdef __getattr__(A,attr):return getattr(A._response,attr)\n\tasync def arrayBuffer(B):\n\t\tA=await B._response.arrayBuffer()\n\t\tif hasattr(A,'to_py'):return A.to_py()\n\t\treturn memoryview(as_bytearray(A))\n\tasync def blob(A):return await A._response.blob()\n\tasync def bytearray(A):B=await A._response.arrayBuffer();return as_bytearray(B)\n\tasync def json(A):return json.loads(await A.text())\n\tasync def text(A):return await A._response.text()\nclass _DirectResponse:\n\t@staticmethod\n\tdef setup(promise,response):A=promise;A._response=_Response(response);return A._response\n\tdef __init__(B,promise):A=promise;B._promise=A;A._response=None;A.arrayBuffer=B.arrayBuffer;A.blob=B.blob;A.bytearray=B.bytearray;A.json=B.json;A.text=B.text\n\tasync def _response(A):\n\t\tif not A._promise._response:await A._promise\n\t\treturn A._promise._response\n\tasync def arrayBuffer(A):B=await A._response();return await B.arrayBuffer()\n\tasync def blob(A):B=await A._response();return await B.blob()\n\tasync def bytearray(A):B=await A._response();return await B.bytearray()\n\tasync def json(A):B=await A._response();return await B.json()\n\tasync def text(A):B=await A._response();return await B.text()\ndef fetch(url,**B):C=js.JSON.parse(json.dumps(B));D=lambda response,*B:_DirectResponse.setup(A,response);A=js.fetch(url,C).then(D);_DirectResponse(A);return A",
-    "ffi.py": "try:\n\timport js;from pyodide.ffi import create_proxy as _cp,to_js as _py_tjs,jsnull;from_entries=js.Object.fromEntries;is_none=lambda value:value is None or value is jsnull\n\tdef _tjs(value,**A):\n\t\tB='dict_converter'\n\t\tif not hasattr(A,B):A[B]=from_entries\n\t\treturn _py_tjs(value,**A)\nexcept:from jsffi import create_proxy as _cp;from jsffi import to_js as _tjs;import js;jsnull=js.Object.getPrototypeOf(js.Object.prototype);is_none=lambda value:value is None or value is jsnull\ncreate_proxy=_cp\nto_js=_tjs\ntry:\n\tfrom polyscript import ffi as _ffi;direct=_ffi.direct;gather=_ffi.gather;query=_ffi.query\n\tdef assign(source,*B):\n\t\tA=source\n\t\tfor C in B:_ffi.assign(A,to_js(C))\n\t\treturn A\nexcept:\n\timport js;_assign=js.Object.assign;direct=lambda source:source\n\tdef assign(source,*B):\n\t\tA=source\n\t\tfor C in B:_assign(A,to_js(C))\n\t\treturn A",
+    "__init__.py": "from polyscript import lazy_py_modules as py_import\nfrom pyscript.context import RUNNING_IN_WORKER,PyWorker,config,current_target,document,js_import,js_modules,sync,window\nfrom pyscript.display import HTML,display\nfrom pyscript.fetch import fetch\nfrom pyscript.storage import Storage,storage\nfrom pyscript.websocket import WebSocket\nfrom pyscript.events import when,Event\nif not RUNNING_IN_WORKER:from pyscript.workers import create_named_worker,workers",
+    "context.py": "_A=None\nimport json,sys,js\nfrom polyscript import config as _polyscript_config,js_modules\nfrom pyscript.util import NotSupported\nRUNNING_IN_WORKER=not hasattr(js,'document')\nconfig=json.loads(js.JSON.stringify(_polyscript_config))\nif isinstance(config,str):config={}\njs_import=_A\nwindow=_A\ndocument=_A\nsync=_A\nif'MicroPython'in sys.version:config['type']='mpy'\nelse:config['type']='py'\nclass _JSModuleProxy:\n\tdef __init__(A,name):A.name=name\n\tdef __getattr__(B,field):\n\t\tA=field\n\t\tif not A.startswith('_'):return getattr(getattr(js_modules,B.name),A)\nfor module_name in js.Reflect.ownKeys(js_modules):sys.modules[f\"pyscript.js_modules.{module_name}\"]=_JSModuleProxy(module_name)\nsys.modules['pyscript.js_modules']=js_modules\nif RUNNING_IN_WORKER:\n\timport polyscript;PyWorker=NotSupported('pyscript.PyWorker','pyscript.PyWorker works only when running in the main thread')\n\ttry:window=polyscript.xworker.window;document=window.document;js.document=document;js_import=window.Function('return (...urls) => Promise.all(urls.map((url) => import(url)))')()\n\texcept:sab_error_message='Unable to use `window` or `document` in worker. This requires SharedArrayBuffer support. See: https://docs.pyscript.net/latest/faq/#sharedarraybuffer';js.console.warn(sab_error_message);window=NotSupported('pyscript.window',sab_error_message);document=NotSupported('pyscript.document',sab_error_message)\n\tsync=polyscript.xworker.sync\n\tdef current_target():return polyscript.target\nelse:\n\timport _pyscript;from _pyscript import PyWorker as _PyWorker;from pyscript.ffi import to_js;js_import=_pyscript.js_import\n\tdef PyWorker(url,**A):return _PyWorker(url,to_js(A))\n\twindow=js;document=js.document;sync=NotSupported('pyscript.sync','pyscript.sync works only when running in a worker')\n\tdef current_target():return _pyscript.target",
+    "display.py": "_I='__repr__'\n_H='savefig'\n_G='application/json'\n_F='image/svg+xml'\n_E='application/javascript'\n_D='image/jpeg'\n_C='text/html'\n_B='image/png'\n_A='text/plain'\nimport base64,html,io\nfrom collections import OrderedDict\nfrom pyscript.context import current_target,document,window\nfrom pyscript.ffi import is_none\ndef _render_image(mime,value,meta):\n\tA=value\n\tif isinstance(A,bytes):A=base64.b64encode(A).decode('utf-8')\n\tB=''.join([f' {A}=\"{B}\"'for(A,B)in meta.items()]);return f'<img src=\"data:{mime};base64,{A}\"{B}>'\n_MIME_TO_RENDERERS={_A:lambda v,m:html.escape(v),_C:lambda v,m:v,_B:lambda v,m:_render_image(_B,v,m),_D:lambda v,m:_render_image(_D,v,m),_F:lambda v,m:v,_G:lambda v,m:v,_E:lambda v,m:f\"<script>{v}<\\\\/script>\"}\n_METHOD_TO_MIME=OrderedDict([(_H,_B),('_repr_png_',_B),('_repr_jpeg_',_D),('_repr_svg_',_F),('_repr_html_',_C),('_repr_json_',_G),('_repr_javascript_',_E),(_I,_A)])\nclass HTML:\n\tdef __init__(A,html):A._html=html\n\tdef _repr_html_(A):return A._html\ndef _get_representation(obj,method):\n\tB=method;A=obj\n\tif B==_I:return repr(A)\n\tif not hasattr(A,B):return\n\tif B==_H:C=io.BytesIO();A.savefig(C,format='png');C.seek(0);return base64.b64encode(C.read()).decode('utf-8')\n\treturn getattr(A,B)()\ndef _get_content_and_mime(obj):\n\tC=obj\n\tif isinstance(C,str):return html.escape(C),_A\n\tE=_get_representation(C,'_repr_mimebundle_')\n\tif E:\n\t\tif isinstance(E,tuple):F,G=E\n\t\telse:F,G=E,{}\n\t\tfor(B,A)in F.items():\n\t\t\tif B in _MIME_TO_RENDERERS:\n\t\t\t\tD=G.get(B,{})\n\t\t\t\tif isinstance(A,tuple):A,H=A;D.update(H)\n\t\t\t\treturn _MIME_TO_RENDERERS[B](A,D),B\n\tfor(I,B)in _METHOD_TO_MIME.items():\n\t\tif B not in _MIME_TO_RENDERERS:continue\n\t\tA=_get_representation(C,I)\n\t\tif A is None:continue\n\t\tD={}\n\t\tif isinstance(A,tuple):A,D=A\n\t\treturn _MIME_TO_RENDERERS[B](A,D),B\n\twindow.console.warn(f\"Object {type(C).__name__} has no supported representation method. Using __repr__ as fallback.\");A=repr(C);return html.escape(A),_A\ndef _write_to_dom(element,value,append):\n\tC=element;B,D=_get_content_and_mime(value)\n\tif not B.strip():return\n\tif append:A=document.createElement('div');C.append(A)\n\telse:A=C\n\tif D in(_E,_C):A.append(document.createRange().createContextualFragment(B))\n\telse:A.innerHTML=B\ndef display(*D,target=None,append=True):\n\tC=append;A=target\n\tif isinstance(A,str):A=A[1:]if A.startswith('#')else A\n\telif is_none(A):A=current_target()\n\tB=document.getElementById(A)\n\tif is_none(B):raise ValueError(f\"Cannot find element with id='{A}' in the page.\")\n\tif B.tagName=='SCRIPT'and hasattr(B,'target'):B=B.target\n\tif not C:B.replaceChildren()\n\tfor E in D:_write_to_dom(B,E,C)",
+    "events.py": "import asyncio,inspect\nfrom functools import wraps\nfrom pyscript.context import document\nfrom pyscript.ffi import create_proxy,to_js\nfrom pyscript.util import is_awaitable\nclass Event:\n\tdef __init__(A):A._listeners=[]\n\tdef trigger(C,result):\n\t\tB=result\n\t\tfor A in C._listeners:\n\t\t\tif is_awaitable(A):asyncio.create_task(A(B))\n\t\t\telse:A(B)\n\tdef add_listener(B,listener):\n\t\tA=listener\n\t\tif not callable(A):C='Listener must be callable.';raise ValueError(C)\n\t\tif A not in B._listeners:B._listeners.append(A)\n\tdef remove_listener(A,*B):\n\t\tif B:\n\t\t\tfor C in B:\n\t\t\t\ttry:A._listeners.remove(C)\n\t\t\t\texcept ValueError:pass\n\t\telse:A._listeners=[]\ndef when(event_type,selector=None,**C):\n\tB=selector;A=event_type\n\tif isinstance(A,str):\n\t\tif not B:raise ValueError('Selector required for DOM event handling.')\n\t\tD=_get_elements(B)\n\t\tif not D:raise ValueError(f\"No elements found for selector: {B}\")\n\tdef E(func):\n\t\tB=_create_wrapper(func)\n\t\tif isinstance(A,Event):A.add_listener(B)\n\t\telif isinstance(A,list)and all(isinstance(A,Event)for A in A):\n\t\t\tfor E in A:E.add_listener(B)\n\t\telse:\n\t\t\tfor F in D:F.addEventListener(A,create_proxy(B),to_js(C)if C else False)\n\t\treturn B\n\treturn E\ndef _get_elements(selector):\n\tA=selector;from pyscript.web import Element as B,ElementCollection as C\n\tif isinstance(A,str):return list(document.querySelectorAll(A))\n\telif isinstance(A,B):return[A._dom_element]\n\telif isinstance(A,C):return[A._dom_element for A in A]\n\telif isinstance(A,list):return A\n\telse:return[A]\ndef _create_wrapper(func):\n\tA=func;B=A\n\twhile hasattr(B,'__wrapped__'):B=B.__wrapped__\n\tE=inspect.signature(B);D=bool(E.parameters)\n\tif is_awaitable(A):\n\t\tif D:\n\t\t\tasync def C(event):return await A(event)\n\t\telse:\n\t\t\tasync def C(*B,**C):return await A()\n\telif D:\n\t\tdef C(event):return A(event)\n\telse:\n\t\tdef C(*B,**C):return A()\n\treturn wraps(A)(C)",
+    "fetch.py": "import json,js\nfrom pyscript.util import as_bytearray\nclass _FetchResponse:\n\tdef __init__(A,response):A._response=response\n\tdef __getattr__(A,attr):return getattr(A._response,attr)\n\tasync def arrayBuffer(B):\n\t\tA=await B._response.arrayBuffer()\n\t\tif hasattr(A,'to_py'):return A.to_py()\n\t\treturn memoryview(as_bytearray(A))\n\tasync def blob(A):return await A._response.blob()\n\tasync def bytearray(A):B=await A._response.arrayBuffer();return as_bytearray(B)\n\tasync def json(A):return json.loads(await A.text())\n\tasync def text(A):return await A._response.text()\nclass _FetchPromise:\n\tdef __init__(B,promise):A=promise;B._promise=A;A._response=None;A.arrayBuffer=B.arrayBuffer;A.blob=B.blob;A.bytearray=B.bytearray;A.json=B.json;A.text=B.text\n\t@staticmethod\n\tdef setup(promise,response):A=promise;A._response=_FetchResponse(response);return A._response\n\tasync def _get_response(A):\n\t\tif not A._promise._response:await A._promise\n\t\treturn A._promise._response\n\tasync def arrayBuffer(A):B=await A._get_response();return await B.arrayBuffer()\n\tasync def blob(A):B=await A._get_response();return await B.blob()\n\tasync def bytearray(A):B=await A._get_response();return await B.bytearray()\n\tasync def json(A):B=await A._get_response();return await B.json()\n\tasync def text(A):B=await A._get_response();return await B.text()\ndef fetch(url,**B):\n\tC=js.JSON.parse(json.dumps(B))\n\tdef D(response,*B):return _FetchPromise.setup(A,response)\n\tA=js.fetch(url,C).then(D);_FetchPromise(A);return A",
+    "ffi.py": "try:\n\timport js;from pyodide.ffi import create_proxy as _cp,to_js as _py_tjs,jsnull;from_entries=js.Object.fromEntries\n\tdef _to_js_wrapper(value,**A):\n\t\tB='dict_converter'\n\t\tif B not in A:A[B]=from_entries\n\t\treturn _py_tjs(value,**A)\nexcept:from jsffi import create_proxy as _cp;from jsffi import to_js as _to_js_wrapper;import js;jsnull=js.Object.getPrototypeOf(js.Object.prototype)\ndef create_proxy(func):return _cp(func)\ndef to_js(value,**A):return _to_js_wrapper(value,**A)\ndef is_none(value):A=value;return A is None or A is jsnull\ntry:from polyscript import ffi as _ffi;_assign=_ffi.assign;direct=_ffi.direct;gather=_ffi.gather;query=_ffi.query\nexcept:import js;_assign=js.Object.assign;direct=lambda source:source\ndef assign(source,*B):\n\tA=source\n\tfor C in B:_assign(A,to_js(C))\n\treturn A",
     "flatted.py": "import json as _json\nclass _Known:\n\tdef __init__(A):A.key=[];A.value=[]\nclass _String:\n\tdef __init__(A,value):A.value=value\ndef _array_keys(value):\n\tA=[];B=0\n\tfor C in value:A.append(B);B+=1\n\treturn A\ndef _object_keys(value):\n\tA=[]\n\tfor B in value:A.append(B)\n\treturn A\ndef _is_array(value):return isinstance(value,(list,tuple))\ndef _is_object(value):return isinstance(value,dict)\ndef _is_string(value):return isinstance(value,str)\ndef _index(known,input,value):B=value;A=known;input.append(B);C=str(len(input)-1);A.key.append(B);A.value.append(C);return C\ndef _loop(keys,input,known,output):\n\tA=output\n\tfor B in keys:\n\t\tC=A[B]\n\t\tif isinstance(C,_String):_ref(B,input[int(C.value)],input,known,A)\n\treturn A\ndef _ref(key,value,input,known,output):\n\tB=known;A=value\n\tif _is_array(A)and A not in B:B.append(A);A=_loop(_array_keys(A),input,B,A)\n\telif _is_object(A)and A not in B:B.append(A);A=_loop(_object_keys(A),input,B,A)\n\toutput[key]=A\ndef _relate(known,input,value):\n\tB=known;A=value\n\tif _is_string(A)or _is_array(A)or _is_object(A):\n\t\ttry:return B.value[B.key.index(A)]\n\t\texcept:return _index(B,input,A)\n\treturn A\ndef _transform(known,input,value):\n\tB=known;A=value\n\tif _is_array(A):\n\t\tC=[]\n\t\tfor F in A:C.append(_relate(B,input,F))\n\t\treturn C\n\tif _is_object(A):\n\t\tD={}\n\t\tfor E in A:D[E]=_relate(B,input,A[E])\n\t\treturn D\n\treturn A\ndef _wrap(value):\n\tA=value\n\tif _is_string(A):return _String(A)\n\tif _is_array(A):\n\t\tB=0\n\t\tfor D in A:A[B]=_wrap(D);B+=1\n\telif _is_object(A):\n\t\tfor C in A:A[C]=_wrap(A[C])\n\treturn A\ndef parse(value,*C,**D):\n\tA=value;E=_json.loads(A,*C,**D);B=[]\n\tfor A in E:B.append(_wrap(A))\n\tinput=[]\n\tfor A in B:\n\t\tif isinstance(A,_String):input.append(A.value)\n\t\telse:input.append(A)\n\tA=input[0]\n\tif _is_array(A):return _loop(_array_keys(A),input,[A],A)\n\tif _is_object(A):return _loop(_object_keys(A),input,[A],A)\n\treturn A\ndef stringify(value,*D,**E):\n\tB=_Known();input=[];C=[];A=int(_index(B,input,value))\n\twhile A<len(input):C.append(_transform(B,input,input[A]));A+=1\n\treturn _json.dumps(C,*D,**E)",
-    "fs.py": "_B='pyscript'\n_A=None\nmounted={}\nasync def get_handler(details):A=details;B=A.handler;C=A.options;D=await B.queryPermission(C);return B if D=='granted'else _A\nasync def mount(path,mode='readwrite',root='',id=_B):\n\tF=path;import js;from _pyscript import fs as C,interpreter as L;from pyscript.ffi import to_js as G;from pyscript.magic_js import RUNNING_IN_WORKER as M,sync as J;js.console.warn('experimental pyscript.fs ⚠️');A=_A;B=_A;D=f\"{F}@{id}\";H={'id':id,'mode':mode}\n\tif root!='':H['startIn']=root\n\tif M:\n\t\tI=J.storeFSHandler(D,G(H))\n\t\tif isinstance(I,bool):E=I\n\t\telse:E=await I\n\t\tif E:\n\t\t\tfrom polyscript import IDBMap as N;from pyscript import window;O=N.new(C.NAMESPACE);A=await O.get(D);B=await get_handler(A)\n\t\t\tif B is _A:await js.Promise.resolve(J.getFSHandler(A.options));B=A.handler\n\t\telse:raise RuntimeError(C.ERROR)\n\telse:\n\t\tE=await C.idb.has(D)\n\t\tif E:\n\t\t\tA=await C.idb.get(D);B=await get_handler(A)\n\t\t\tif B is _A:B=await C.getFileSystemDirectoryHandle(A.options)\n\t\telse:K=G(H);B=await C.getFileSystemDirectoryHandle(K);A={'handler':B,'options':K};await C.idb.set(D,G(A))\n\tmounted[F]=await L.mountNativeFS(F,B)\nasync def revoke(path,id=_B):\n\tfrom _pyscript import fs,interpreter as C;from pyscript.magic_js import RUNNING_IN_WORKER as D,sync;B=f\"{path}@{id}\"\n\tif D:A=sync.deleteFSHandler(B)\n\telse:\n\t\tA=await fs.idb.has(B)\n\t\tif A:A=await fs.idb.delete(B)\n\tif A:C._module.FS.unmount(path)\n\treturn A\nasync def sync(path):await mounted[path].syncfs()\nasync def unmount(path):from _pyscript import interpreter as A;await sync(path);A._module.FS.unmount(path)",
-    "magic_js.py": "import json,sys,js as globalThis\nfrom polyscript import config as _config,js_modules\nfrom pyscript.util import NotSupported\nRUNNING_IN_WORKER=not hasattr(globalThis,'document')\nconfig=json.loads(globalThis.JSON.stringify(_config))\nif isinstance(config,str):config={}\nif'MicroPython'in sys.version:config['type']='mpy'\nelse:config['type']='py'\nclass JSModule:\n\tdef __init__(A,name):A.name=name\n\tdef __getattr__(B,field):\n\t\tA=field\n\t\tif not A.startswith('_'):return getattr(getattr(js_modules,B.name),A)\nfor name in globalThis.Reflect.ownKeys(js_modules):sys.modules[f\"pyscript.js_modules.{name}\"]=JSModule(name)\nsys.modules['pyscript.js_modules']=js_modules\nif RUNNING_IN_WORKER:\n\timport polyscript;PyWorker=NotSupported('pyscript.PyWorker','pyscript.PyWorker works only when running in the main thread')\n\ttry:import js;window=polyscript.xworker.window;document=window.document;js.document=document;js_import=window.Function('return (...urls) => Promise.all(urls.map((url) => import(url)))')()\n\texcept:message='Unable to use `window` or `document` -> https://docs.pyscript.net/latest/faq/#sharedarraybuffer';globalThis.console.warn(message);window=NotSupported('pyscript.window',message);document=NotSupported('pyscript.document',message);js_import=None\n\tsync=polyscript.xworker.sync\n\tdef current_target():return polyscript.target\nelse:\n\timport _pyscript;from _pyscript import PyWorker as _PyWorker,js_import;from pyscript.ffi import to_js\n\tdef PyWorker(url,**A):return _PyWorker(url,to_js(A))\n\twindow=globalThis;document=globalThis.document;sync=NotSupported('pyscript.sync','pyscript.sync works only when running in a worker')\n\tdef current_target():return _pyscript.target",
-    "media.py": "from pyscript import window\nfrom pyscript.ffi import to_js\nclass Device:\n\tdef __init__(A,device):A._dom_element=device\n\t@property\n\tdef id(self):return self._dom_element.deviceId\n\t@property\n\tdef group(self):return self._dom_element.groupId\n\t@property\n\tdef kind(self):return self._dom_element.kind\n\t@property\n\tdef label(self):return self._dom_element.label\n\tdef __getitem__(A,key):return getattr(A,key)\n\t@classmethod\n\tasync def load(E,audio=False,video=True):\n\t\tC='video';B=video;A={};A['audio']=audio\n\t\tif isinstance(B,bool):A[C]=B\n\t\telse:\n\t\t\tA[C]={}\n\t\t\tfor D in B:A[C][D]=B[D]\n\t\treturn await window.navigator.mediaDevices.getUserMedia(to_js(A))\n\tasync def get_stream(A):B=A.kind.replace('input','').replace('output','');C={B:{'deviceId':{'exact':A.id}}};return await A.load(**C)\nasync def list_devices():return[Device(A)for A in await window.navigator.mediaDevices.enumerateDevices()]",
-    "storage.py": "_C='memoryview'\n_B='bytearray'\n_A='generic'\nfrom polyscript import storage as _storage\nfrom pyscript.flatted import parse as _parse\nfrom pyscript.flatted import stringify as _stringify\nfrom pyscript.ffi import is_none\ndef _to_idb(value):\n\tA=value\n\tif is_none(A):return _stringify(['null',0])\n\tif isinstance(A,(bool,float,int,str,list,dict,tuple)):return _stringify([_A,A])\n\tif isinstance(A,bytearray):return _stringify([_B,list(A)])\n\tif isinstance(A,memoryview):return _stringify([_C,list(A)])\n\tB=f\"Unexpected value: {A}\";raise TypeError(B)\ndef _from_idb(value):\n\tC=value;A,B=_parse(C)\n\tif A=='null':return\n\tif A==_A:return B\n\tif A==_B:return bytearray(B)\n\tif A==_C:return memoryview(bytearray(B))\n\treturn C\nclass Storage(dict):\n\tdef __init__(B,store):A=store;super().__init__({A:_from_idb(B)for(A,B)in A.entries()});B.__store__=A\n\tdef __delitem__(A,attr):A.__store__.delete(attr);super().__delitem__(attr)\n\tdef __setitem__(B,attr,value):A=value;B.__store__.set(attr,_to_idb(A));super().__setitem__(attr,A)\n\tdef clear(A):A.__store__.clear();super().clear()\n\tasync def sync(A):await A.__store__.sync()\nasync def storage(name='',storage_class=Storage):\n\tif not name:A='The storage name must be defined';raise ValueError(A)\n\treturn storage_class(await _storage(f\"@pyscript/{name}\"))",
-    "util.py": "import js,sys,inspect\ndef as_bytearray(buffer):\n\tA=js.Uint8Array.new(buffer);B=A.length;C=bytearray(B)\n\tfor D in range(B):C[D]=A[D]\n\treturn C\nclass NotSupported:\n\tdef __init__(A,name,error):object.__setattr__(A,'name',name);object.__setattr__(A,'error',error)\n\tdef __repr__(A):return f\"<NotSupported {A.name} [{A.error}]>\"\n\tdef __getattr__(A,attr):raise AttributeError(A.error)\n\tdef __setattr__(A,attr,value):raise AttributeError(A.error)\n\tdef __call__(A,*B):raise TypeError(A.error)\ndef is_awaitable(obj):\n\tA=obj;from pyscript import config as B\n\tif B['type']=='mpy':\n\t\tif'<closure <generator>'in repr(A):return True\n\t\treturn inspect.isgeneratorfunction(A)\n\treturn inspect.iscoroutinefunction(A)",
-    "web.py": "_C='htmlFor'\n_B='on_'\n_A=None\nfrom pyscript import document,when,Event\nfrom pyscript.ffi import create_proxy,is_none\ndef wrap_dom_element(dom_element):return Element.wrap_dom_element(dom_element)\nclass Element:\n\telement_classes_by_tag_name={}\n\t@classmethod\n\tdef get_tag_name(A):return A.__name__.replace('_','')\n\t@classmethod\n\tdef register_element_classes(B,element_classes):\n\t\tfor A in element_classes:C=A.get_tag_name();B.element_classes_by_tag_name[C]=A\n\t@classmethod\n\tdef unregister_element_classes(A,element_classes):\n\t\tfor B in element_classes:C=B.get_tag_name();A.element_classes_by_tag_name.pop(C,_A)\n\t@classmethod\n\tdef wrap_dom_element(A,dom_element):B=dom_element;C=A.element_classes_by_tag_name.get(B.tagName.lower(),A);return C(dom_element=B)\n\tdef __init__(A,dom_element=_A,classes=_A,style=_A,**F):\n\t\tC=dom_element;A._dom_element=document.createElement(type(A).get_tag_name())if is_none(C)else C;A._on_events={};D={}\n\t\tfor(B,E)in F.items():\n\t\t\tif B.startswith(_B):G=A.get_event(B);G.add_listener(E)\n\t\t\telse:D[B]=E\n\t\tA._classes=Classes(A);A._style=Style(A);A.update(classes=classes,style=style,**D)\n\tdef __eq__(A,obj):return isinstance(obj,Element)and obj._dom_element==A._dom_element\n\tdef __getitem__(B,key):\n\t\tA=key\n\t\tif isinstance(A,(int,slice)):return B.children[A]\n\t\treturn B.find(A)\n\tdef __getattr__(B,name):\n\t\tA=name\n\t\tif A.startswith(_B):return B.get_event(A)\n\t\tif A.endswith('_'):A=A[:-1]\n\t\tif A=='for':A=_C\n\t\treturn getattr(B._dom_element,A)\n\tdef __setattr__(C,name,value):\n\t\tB=value;A=name\n\t\tif A.startswith('_'):super().__setattr__(A,B)\n\t\telse:\n\t\t\tif A.endswith('_'):A=A[:-1]\n\t\t\tif A=='for':A=_C\n\t\t\tif A.startswith(_B):C._on_events[A]=B\n\t\t\tsetattr(C._dom_element,A,B)\n\tdef get_event(A,name):\n\t\tB=name\n\t\tif not B.startswith(_B):C=\"Event names must start with 'on_'.\";raise ValueError(C)\n\t\tD=B[3:]\n\t\tif not hasattr(A._dom_element,D):C=f\"Element has no '{D}' event.\";raise ValueError(C)\n\t\tif B in A._on_events:return A._on_events[B]\n\t\tE=Event();A._on_events[B]=E;A._dom_element.addEventListener(D,create_proxy(E.trigger));return E\n\t@property\n\tdef children(self):return ElementCollection.wrap_dom_elements(self._dom_element.children)\n\t@property\n\tdef classes(self):return self._classes\n\t@property\n\tdef parent(self):\n\t\tif is_none(self._dom_element.parentElement):return\n\t\treturn Element.wrap_dom_element(self._dom_element.parentElement)\n\t@property\n\tdef style(self):return self._style\n\tdef append(B,*C):\n\t\tfor A in C:\n\t\t\tif isinstance(A,Element):B._dom_element.appendChild(A._dom_element)\n\t\t\telif isinstance(A,ElementCollection):\n\t\t\t\tfor D in A:B._dom_element.appendChild(D._dom_element)\n\t\t\telif isinstance(A,(list,tuple)):\n\t\t\t\tfor E in A:B.append(E)\n\t\t\telse:\n\t\t\t\ttry:A.tagName;B._dom_element.appendChild(A)\n\t\t\t\texcept AttributeError:\n\t\t\t\t\ttry:\n\t\t\t\t\t\tA.length\n\t\t\t\t\t\tfor F in A:B._dom_element.appendChild(F)\n\t\t\t\t\texcept AttributeError:G=f'Element \"{A}\" is a proxy object, \"but not a valid element or a NodeList.';raise TypeError(G)\n\tdef clone(B,clone_id=_A):A=Element.wrap_dom_element(B._dom_element.cloneNode(True));A.id=clone_id;return A\n\tdef find(A,selector):return ElementCollection.wrap_dom_elements(A._dom_element.querySelectorAll(selector))\n\tdef show_me(A):A._dom_element.scrollIntoView()\n\tdef update(A,classes=_A,style=_A,**D):\n\t\tC=style;B=classes\n\t\tif B:A.classes.add(B)\n\t\tif C:A.style.set(**C)\n\t\tfor(E,F)in D.items():setattr(A,E,F)\nclass Classes:\n\tdef __init__(A,element):A._element=element;A._class_list=A._element._dom_element.classList\n\tdef __contains__(A,item):return item in A._class_list\n\tdef __eq__(C,other):\n\t\tA=other\n\t\tif isinstance(A,Classes):B=list(A._class_list)\n\t\telse:\n\t\t\ttry:B=iter(A)\n\t\t\texcept TypeError:return False\n\t\treturn set(C._class_list)==set(B)\n\tdef __iter__(A):return iter(A._class_list)\n\tdef __len__(A):return A._class_list.length\n\tdef __repr__(A):return f\"Classes({\", \".join(A._class_list)})\"\n\tdef __str__(A):return' '.join(A._class_list)\n\tdef add(B,*C):\n\t\tfor A in C:\n\t\t\tif isinstance(A,list):\n\t\t\t\tfor D in A:B.add(D)\n\t\t\telse:B._class_list.add(A)\n\tdef contains(A,class_name):return class_name in A\n\tdef remove(B,*C):\n\t\tfor A in C:\n\t\t\tif isinstance(A,list):\n\t\t\t\tfor D in A:B.remove(D)\n\t\t\telse:B._class_list.remove(A)\n\tdef replace(A,old_class,new_class):A.remove(old_class);A.add(new_class)\n\tdef toggle(A,*C):\n\t\tfor B in C:\n\t\t\tif B in A:A.remove(B)\n\t\t\telse:A.add(B)\nclass HasOptions:\n\t@property\n\tdef options(self):\n\t\tA=self\n\t\tif not hasattr(A,'_options'):A._options=Options(A)\n\t\treturn A._options\nclass Options:\n\tdef __init__(A,element):A._element=element\n\tdef __getitem__(A,key):return A.options[key]\n\tdef __iter__(A):yield from A.options\n\tdef __len__(A):return len(A.options)\n\tdef __repr__(A):return f\"{A.__class__.__name__} (length: {len(A)}) {A.options}\"\n\t@property\n\tdef options(self):return[Element.wrap_dom_element(A)for A in self._element._dom_element.options]\n\t@property\n\tdef selected(self):return self.options[self._element._dom_element.selectedIndex]\n\tdef add(D,value=_A,html=_A,text=_A,before=_A,**B):\n\t\tC=value;A=before\n\t\tif C is not _A:B['value']=C\n\t\tif html is not _A:B['innerHTML']=html\n\t\tif text is not _A:B['text']=text\n\t\tE=option(**B)\n\t\tif A and isinstance(A,Element):A=A._dom_element\n\t\tD._element._dom_element.add(E._dom_element,A)\n\tdef clear(A):\n\t\twhile len(A)>0:A.remove(0)\n\tdef remove(A,index):A._element._dom_element.remove(index)\nclass Style:\n\tdef __init__(A,element):A._element=element;A._style=A._element._dom_element.style\n\tdef __getitem__(A,key):return A._style.getPropertyValue(key)\n\tdef __setitem__(A,key,value):A._style.setProperty(key,value)\n\tdef remove(A,key):A._style.removeProperty(key)\n\tdef set(A,**B):\n\t\tfor(C,D)in B.items():A._element._dom_element.style.setProperty(C,D)\n\t@property\n\tdef visible(self):return self._element._dom_element.style.visibility\n\t@visible.setter\n\tdef visible(self,value):self._element._dom_element.style.visibility=value\nclass ContainerElement(Element):\n\tdef __init__(B,*C,children=_A,dom_element=_A,style=_A,classes=_A,**D):\n\t\tsuper().__init__(dom_element=dom_element,style=style,classes=classes,**D)\n\t\tfor A in list(C)+(children or[]):\n\t\t\tif isinstance(A,(Element,ElementCollection)):B.append(A)\n\t\t\telse:B._dom_element.insertAdjacentHTML('beforeend',A)\n\tdef __iter__(A):yield from A.children\nclass ClassesCollection:\n\tdef __init__(A,collection):A._collection=collection\n\tdef __contains__(A,class_name):\n\t\tfor B in A._collection:\n\t\t\tif class_name in B.classes:return True\n\t\treturn False\n\tdef __eq__(B,other):A=other;return isinstance(A,ClassesCollection)and B._collection==A._collection\n\tdef __iter__(A):yield from A._all_class_names()\n\tdef __len__(A):return len(A._all_class_names())\n\tdef __repr__(A):return f\"ClassesCollection({A._collection!r})\"\n\tdef __str__(A):return' '.join(A._all_class_names())\n\tdef add(A,*B):\n\t\tfor C in A._collection:C.classes.add(*B)\n\tdef contains(A,class_name):return class_name in A\n\tdef remove(A,*B):\n\t\tfor C in A._collection:C.classes.remove(*B)\n\tdef replace(A,old_class,new_class):\n\t\tfor B in A._collection:B.classes.replace(old_class,new_class)\n\tdef toggle(A,*B):\n\t\tfor C in A._collection:C.classes.toggle(*B)\n\tdef _all_class_names(B):\n\t\tA=set()\n\t\tfor C in B._collection:\n\t\t\tfor D in C.classes:A.add(D)\n\t\treturn A\nclass StyleCollection:\n\tdef __init__(A,collection):A._collection=collection\n\tdef __getitem__(A,key):return[A.style[key]for A in A._collection._elements]\n\tdef __setitem__(A,key,value):\n\t\tfor B in A._collection._elements:B.style[key]=value\n\tdef __repr__(A):return f\"StyleCollection({A._collection!r})\"\n\tdef remove(A,key):\n\t\tfor B in A._collection._elements:B.style.remove(key)\nclass ElementCollection:\n\t@classmethod\n\tdef wrap_dom_elements(A,dom_elements):return A([Element.wrap_dom_element(A)for A in dom_elements])\n\tdef __init__(A,elements):A._elements=elements;A._classes=ClassesCollection(A);A._style=StyleCollection(A)\n\tdef __eq__(A,obj):return isinstance(obj,ElementCollection)and obj._elements==A._elements\n\tdef __getitem__(B,key):\n\t\tA=key\n\t\tif isinstance(A,int):return B._elements[A]\n\t\tif isinstance(A,slice):return ElementCollection(B._elements[A])\n\t\treturn B.find(A)\n\tdef __iter__(A):yield from A._elements\n\tdef __len__(A):return len(A._elements)\n\tdef __repr__(A):return f\"{A.__class__.__name__} (length: {len(A._elements)}) {A._elements}\"\n\tdef __getattr__(A,name):return[getattr(A,name)for A in A._elements]\n\tdef __setattr__(C,name,value):\n\t\tB=value;A=name\n\t\tif A.startswith('_'):super().__setattr__(A,B)\n\t\telse:\n\t\t\tfor D in C._elements:setattr(D,A,B)\n\t@property\n\tdef classes(self):return self._classes\n\t@property\n\tdef elements(self):return self._elements\n\t@property\n\tdef style(self):return self._style\n\tdef find(B,selector):\n\t\tA=[]\n\t\tfor C in B._elements:A.extend(C.find(selector))\n\t\treturn ElementCollection(A)\nclass a(ContainerElement):0\nclass abbr(ContainerElement):0\nclass address(ContainerElement):0\nclass area(Element):0\nclass article(ContainerElement):0\nclass aside(ContainerElement):0\nclass audio(ContainerElement):0\nclass b(ContainerElement):0\nclass base(Element):0\nclass blockquote(ContainerElement):0\nclass body(ContainerElement):0\nclass br(Element):0\nclass button(ContainerElement):0\nclass canvas(ContainerElement):\n\tdef download(A,filename='snapped.png'):B=a(download=filename,href=A._dom_element.toDataURL());A.append(B);B._dom_element.click()\n\tdef draw(E,what,width=_A,height=_A):\n\t\tC=height;B=width;A=what\n\t\tif isinstance(A,Element):A=A._dom_element\n\t\tD=E._dom_element.getContext('2d')\n\t\tif B or C:D.drawImage(A,0,0,B,C)\n\t\telse:D.drawImage(A,0,0)\nclass caption(ContainerElement):0\nclass cite(ContainerElement):0\nclass code(ContainerElement):0\nclass col(Element):0\nclass colgroup(ContainerElement):0\nclass data(ContainerElement):0\nclass datalist(ContainerElement,HasOptions):0\nclass dd(ContainerElement):0\nclass del_(ContainerElement):0\nclass details(ContainerElement):0\nclass dialog(ContainerElement):0\nclass div(ContainerElement):0\nclass dl(ContainerElement):0\nclass dt(ContainerElement):0\nclass em(ContainerElement):0\nclass embed(Element):0\nclass fieldset(ContainerElement):0\nclass figcaption(ContainerElement):0\nclass figure(ContainerElement):0\nclass footer(ContainerElement):0\nclass form(ContainerElement):0\nclass h1(ContainerElement):0\nclass h2(ContainerElement):0\nclass h3(ContainerElement):0\nclass h4(ContainerElement):0\nclass h5(ContainerElement):0\nclass h6(ContainerElement):0\nclass head(ContainerElement):0\nclass header(ContainerElement):0\nclass hgroup(ContainerElement):0\nclass hr(Element):0\nclass html(ContainerElement):0\nclass i(ContainerElement):0\nclass iframe(ContainerElement):0\nclass img(Element):0\nclass input_(Element):0\nclass ins(ContainerElement):0\nclass kbd(ContainerElement):0\nclass label(ContainerElement):0\nclass legend(ContainerElement):0\nclass li(ContainerElement):0\nclass link(Element):0\nclass main(ContainerElement):0\nclass map_(ContainerElement):0\nclass mark(ContainerElement):0\nclass menu(ContainerElement):0\nclass meta(ContainerElement):0\nclass meter(ContainerElement):0\nclass nav(ContainerElement):0\nclass object_(ContainerElement):0\nclass ol(ContainerElement):0\nclass optgroup(ContainerElement,HasOptions):0\nclass option(ContainerElement):0\nclass output(ContainerElement):0\nclass p(ContainerElement):0\nclass param(ContainerElement):0\nclass picture(ContainerElement):0\nclass pre(ContainerElement):0\nclass progress(ContainerElement):0\nclass q(ContainerElement):0\nclass s(ContainerElement):0\nclass script(ContainerElement):0\nclass section(ContainerElement):0\nclass select(ContainerElement,HasOptions):0\nclass small(ContainerElement):0\nclass source(Element):0\nclass span(ContainerElement):0\nclass strong(ContainerElement):0\nclass style(ContainerElement):0\nclass sub(ContainerElement):0\nclass summary(ContainerElement):0\nclass sup(ContainerElement):0\nclass table(ContainerElement):0\nclass tbody(ContainerElement):0\nclass td(ContainerElement):0\nclass template(ContainerElement):0\nclass textarea(ContainerElement):0\nclass tfoot(ContainerElement):0\nclass th(ContainerElement):0\nclass thead(ContainerElement):0\nclass time(ContainerElement):0\nclass title(ContainerElement):0\nclass tr(ContainerElement):0\nclass track(Element):0\nclass u(ContainerElement):0\nclass ul(ContainerElement):0\nclass var(ContainerElement):0\nclass video(ContainerElement):\n\tdef snap(E,to=_A,width=_A,height=_A):\n\t\tH='CANVAS';G='Element to snap to must be a canvas.';C=height;B=width;A=to;B=B if B is not _A else E.videoWidth;C=C if C is not _A else E.videoHeight\n\t\tif is_none(A):A=canvas(width=B,height=C)\n\t\telif isinstance(A,Element):\n\t\t\tif A.tag!='canvas':D=G;raise TypeError(D)\n\t\telif getattr(A,'tagName','')==H:A=canvas(dom_element=A)\n\t\telif isinstance(A,str):\n\t\t\tF=document.querySelectorAll(A)\n\t\t\tif F.length==0:D='No element with selector {to} to snap to.';raise TypeError(D)\n\t\t\tif F[0].tagName!=H:D=G;raise TypeError(D)\n\t\t\tA=canvas(dom_element=F[0])\n\t\tA.draw(E,B,C);return A\nclass wbr(Element):0\nELEMENT_CLASSES=[a,abbr,address,area,article,aside,audio,b,base,blockquote,body,br,button,canvas,caption,cite,code,col,colgroup,data,datalist,dd,del_,details,dialog,div,dl,dt,em,embed,fieldset,figcaption,figure,footer,form,h1,h2,h3,h4,h5,h6,head,header,hgroup,hr,html,i,iframe,img,input_,ins,kbd,label,legend,li,link,main,map_,mark,menu,meta,meter,nav,object_,ol,optgroup,option,output,p,param,picture,pre,progress,q,s,script,section,select,small,source,span,strong,style,sub,summary,sup,table,tbody,td,template,textarea,tfoot,th,thead,time,title,tr,track,u,ul,var,video,wbr]\nElement.register_element_classes(ELEMENT_CLASSES)\nclass Page:\n\tdef __init__(A):A.html=Element.wrap_dom_element(document.documentElement);A.body=Element.wrap_dom_element(document.body);A.head=Element.wrap_dom_element(document.head)\n\tdef __getitem__(A,selector):return A.find(selector)\n\t@property\n\tdef title(self):return document.title\n\t@title.setter\n\tdef title(self,value):document.title=value\n\tdef append(A,*B):A.body.append(*B)\n\tdef find(A,selector):return ElementCollection.wrap_dom_elements(document.querySelectorAll(selector))\npage=Page()",
-    "websocket.py": "import js\nfrom pyscript.ffi import create_proxy\nfrom pyscript.util import as_bytearray,is_awaitable\ncode='code'\nprotocols='protocols'\nreason='reason'\nmethods=['onclose','onerror','onmessage','onopen']\ndef add_listener(socket,onevent,listener):\n\tA=listener;B=create_proxy(A)\n\tif is_awaitable(A):\n\t\tasync def D(e):await B(EventMessage(e))\n\t\tC=D\n\telse:C=lambda e:B(EventMessage(e))\n\tsetattr(socket,onevent,C)\nclass EventMessage:\n\tdef __init__(A,event):A._event=event\n\tdef __getattr__(B,attr):\n\t\tA=getattr(B._event,attr)\n\t\tif attr=='data'and not isinstance(A,str):\n\t\t\tif hasattr(A,'to_py'):return A.to_py()\n\t\t\treturn memoryview(as_bytearray(A))\n\t\treturn A\nclass WebSocket:\n\tCONNECTING=0;OPEN=1;CLOSING=2;CLOSED=3\n\tdef __init__(E,**A):\n\t\tD=A['url']\n\t\tif protocols in A:B=js.WebSocket.new(D,A[protocols])\n\t\telse:B=js.WebSocket.new(D)\n\t\tB.binaryType='arraybuffer';object.__setattr__(E,'_ws',B)\n\t\tfor C in methods:\n\t\t\tif C in A:add_listener(B,C,A[C])\n\tdef __getattr__(A,attr):return getattr(A._ws,attr)\n\tdef __setattr__(B,attr,value):\n\t\tC=value;A=attr\n\t\tif A in methods:add_listener(B._ws,A,C)\n\t\telse:setattr(B._ws,A,C)\n\tdef close(B,**A):\n\t\tif code in A and reason in A:B._ws.close(A[code],A[reason])\n\t\telif code in A:B._ws.close(A[code])\n\t\telse:B._ws.close()\n\tdef send(B,data):\n\t\tA=data\n\t\tif isinstance(A,str):B._ws.send(A)\n\t\telse:\n\t\t\tC=js.Uint8Array.new(len(A))\n\t\t\tfor(D,E)in enumerate(A):C[D]=E\n\t\t\tB._ws.send(C)",
-    "workers.py": "import js as _js\nfrom polyscript import workers as _workers\n_get=_js.Reflect.get\ndef _set(script,name,value=''):script.setAttribute(name,value)\nclass _ReadOnlyProxy:\n\tdef __getitem__(A,name):return _get(_workers,name)\n\tdef __getattr__(A,name):return _get(_workers,name)\nworkers=_ReadOnlyProxy()\nasync def create_named_worker(src='',name='',config=None,type='py'):\n\tC=name;B=config;from json import dumps\n\tif not src:D='Named workers require src';raise ValueError(D)\n\tif not C:D='Named workers require a name';raise ValueError(D)\n\tA=_js.document.createElement('script');A.type=type;A.src=src;_set(A,'worker');_set(A,'name',C)\n\tif B:_set(A,'config',isinstance(B,str)and B or dumps(B))\n\t_js.document.body.append(A);return await workers[C]"
+    "fs.py": "_B='pyscript'\n_A=None\nimport js\nfrom _pyscript import fs as _fs,interpreter\nfrom pyscript import window\nfrom pyscript.ffi import to_js\nfrom pyscript.context import RUNNING_IN_WORKER\nif RUNNING_IN_WORKER:from pyscript.context import sync as sync_with_worker;from polyscript import IDBMap\nmounted={}\nasync def _check_permission(details):A=details;B=A.handler;C=A.options;D=await B.queryPermission(C);return B if D=='granted'else _A\nasync def mount(path,mode='readwrite',root='',id=_B):\n\tC=path;js.console.warn('experimental pyscript.fs ⚠️');D=f\"{C}@{id}\"\n\tif C in mounted:\n\t\tfor H in mounted.keys():\n\t\t\tif H.startswith(f\"{C}@\")and H!=D:raise ValueError(f\"Path '{C}' is already mounted with a different ID. Unmount it first or use a different path.\")\n\tA=_A;B=_A;F={'id':id,'mode':mode}\n\tif root!='':F['startIn']=root\n\tif RUNNING_IN_WORKER:\n\t\tG=sync_with_worker.storeFSHandler(D,to_js(F))\n\t\tif isinstance(G,bool):E=G\n\t\telse:E=await G\n\t\tif E:\n\t\t\tJ=IDBMap.new(_fs.NAMESPACE);A=await J.get(D);B=await _check_permission(A)\n\t\t\tif B is _A:await js.Promise.resolve(sync_with_worker.getFSHandler(A.options));B=A.handler\n\t\telse:raise RuntimeError(_fs.ERROR)\n\telse:\n\t\tE=await _fs.idb.has(D)\n\t\tif E:\n\t\t\tA=await _fs.idb.get(D);B=await _check_permission(A)\n\t\t\tif B is _A:B=await _fs.getFileSystemDirectoryHandle(A.options)\n\t\telse:I=to_js(F);B=await _fs.getFileSystemDirectoryHandle(I);A={'handler':B,'options':I};await _fs.idb.set(D,to_js(A))\n\tmounted[C]=await interpreter.mountNativeFS(C,B)\nasync def sync(path):\n\tA=path\n\tif A not in mounted:raise KeyError(f\"Path '{A}' is not mounted. Use fs.mount() to mount it first.\")\n\tawait mounted[A].syncfs()\nasync def unmount(path):\n\tA=path\n\tif A not in mounted:raise KeyError(f\"Path '{A}' is not mounted. Cannot unmount.\")\n\tawait sync(A);interpreter._module.FS.unmount(A);del mounted[A]\nasync def revoke(path,id=_B):\n\tB=path;C=f\"{B}@{id}\"\n\tif RUNNING_IN_WORKER:A=sync_with_worker.deleteFSHandler(C)\n\telse:\n\t\tA=await _fs.idb.has(C)\n\t\tif A:A=await _fs.idb.delete(C)\n\tif A:\n\t\tinterpreter._module.FS.unmount(B)\n\t\tif B in mounted:del mounted[B]\n\treturn A",
+    "media.py": "from pyscript import window\nfrom pyscript.ffi import to_js\nclass Device:\n\tdef __init__(A,device):A._device_info=device\n\t@property\n\tdef id(self):return self._device_info.deviceId\n\t@property\n\tdef group(self):return self._device_info.groupId\n\t@property\n\tdef kind(self):return self._device_info.kind\n\t@property\n\tdef label(self):return self._device_info.label\n\tdef __getitem__(A,key):return getattr(A,key)\n\t@classmethod\n\tasync def request_stream(F,audio=False,video=True):\n\t\tE='video';D='audio';C=video;B=audio;A={}\n\t\tif isinstance(B,bool):A[D]=B\n\t\telif isinstance(B,dict):A[D]=B\n\t\tif isinstance(C,bool):A[E]=C\n\t\telif isinstance(C,dict):A[E]=C\n\t\treturn await window.navigator.mediaDevices.getUserMedia(to_js(A))\n\t@classmethod\n\tasync def load(A,audio=False,video=True):return await A.request_stream(audio=audio,video=video)\n\tasync def get_stream(A):B=A.kind.replace('input','').replace('output','');C={B:{'deviceId':{'exact':A.id}}};return await A.request_stream(**C)\nasync def list_devices():A=await window.navigator.mediaDevices.enumerateDevices();return[Device(A)for A in A]",
+    "storage.py": "_C='memoryview'\n_B='bytearray'\n_A='generic'\nfrom polyscript import storage as _polyscript_storage\nfrom pyscript.flatted import parse as _parse\nfrom pyscript.flatted import stringify as _stringify\nfrom pyscript.ffi import is_none\ndef _convert_to_idb(value):\n\tA=value\n\tif is_none(A):return _stringify(['null',0])\n\tif isinstance(A,(bool,float,int,str,list,dict,tuple)):return _stringify([_A,A])\n\tif isinstance(A,bytearray):return _stringify([_B,list(A)])\n\tif isinstance(A,memoryview):return _stringify([_C,list(A)])\n\traise TypeError(f\"Cannot serialize type {type(A).__name__} for storage.\")\ndef _convert_from_idb(value):\n\tC=value;A,B=_parse(C)\n\tif A=='null':return\n\tif A==_A:return B\n\tif A==_B:return bytearray(B)\n\tif A==_C:return memoryview(bytearray(B))\n\treturn C\nclass Storage(dict):\n\tdef __init__(B,store):A=store;super().__init__({A:_convert_from_idb(B)for(A,B)in A.entries()});B._store=A\n\tdef __delitem__(A,key):A._store.delete(key);super().__delitem__(key)\n\tdef __setitem__(B,key,value):A=value;B._store.set(key,_convert_to_idb(A));super().__setitem__(key,A)\n\tdef clear(A):A._store.clear();super().clear()\n\tasync def sync(A):await A._store.sync()\nasync def storage(name='',storage_class=Storage):\n\tif not name:raise ValueError('Storage name must be a non-empty string')\n\tA=await _polyscript_storage(f\"@pyscript/{name}\");return storage_class(A)",
+    "util.py": "import js,inspect\ndef as_bytearray(buffer):\n\tA=js.Uint8Array.new(buffer);B=A.length;C=bytearray(B)\n\tfor D in range(B):C[D]=A[D]\n\treturn C\nclass NotSupported:\n\tdef __init__(A,name,error):object.__setattr__(A,'name',name);object.__setattr__(A,'error',error)\n\tdef __repr__(A):return f\"<NotSupported {A.name} [{A.error}]>\"\n\tdef __getattr__(A,attr):raise AttributeError(A.error)\n\tdef __setattr__(A,attr,value):raise AttributeError(A.error)\n\tdef __call__(A,*B):raise TypeError(A.error)\ndef is_awaitable(obj):\n\tA=obj;from pyscript import config as C\n\tif C['type']=='mpy':\n\t\tB=repr(A)\n\t\tif'<closure <generator>'in B:return True\n\t\tif'<bound_method'in B and'<generator>'in B:return True\n\t\treturn inspect.isgeneratorfunction(A)\n\treturn inspect.iscoroutinefunction(A)",
+    "web.py": "_D='object'\n_C='tagName'\n_B='on_'\n_A=None\nfrom pyscript import document,when,Event\nfrom pyscript.ffi import create_proxy,is_none\ndef _wrap_if_not_none(dom_element):return Element.wrap_dom_element(dom_element)if not is_none(dom_element)else _A\ndef _find_by_id(dom_node,target_id):element_id=target_id[1:]if target_id.startswith('#')else target_id;result=dom_node.querySelector(f\"#{element_id}\");return _wrap_if_not_none(result)\ndef _find_and_wrap(dom_node,selector):return ElementCollection.wrap_dom_elements(dom_node.querySelectorAll(selector))\nclass Element:\n\telement_classes_by_tag_name={}\n\t@classmethod\n\tdef get_tag_name(cls):return cls.__name__.replace('_','')\n\t@classmethod\n\tdef register_element_classes(cls,element_classes):\n\t\tfor element_class in element_classes:tag_name=element_class.get_tag_name();cls.element_classes_by_tag_name[tag_name]=element_class\n\t@classmethod\n\tdef unregister_element_classes(cls,element_classes):\n\t\tfor element_class in element_classes:tag_name=element_class.get_tag_name();cls.element_classes_by_tag_name.pop(tag_name,_A)\n\t@classmethod\n\tdef wrap_dom_element(cls,dom_element):element_cls=cls.element_classes_by_tag_name.get(dom_element.tagName.lower(),cls);return element_cls(dom_element=dom_element)\n\tdef __init__(self,dom_element=_A,classes=_A,style=_A,**kwargs):\n\t\tif is_none(dom_element):self._dom_element=document.createElement(type(self).get_tag_name())\n\t\telse:self._dom_element=dom_element\n\t\tself._on_events={};self.update(classes=classes,style=style,**kwargs)\n\tdef __eq__(self,obj):return isinstance(obj,Element)and obj._dom_element==self._dom_element\n\tdef __getitem__(self,key):\n\t\tif isinstance(key,(int,slice)):return self.children[key]\n\t\tif isinstance(key,str):return _find_by_id(self._dom_element,key)\n\t\traise TypeError(f\"Element indices must be integers, slices, or strings, not {type(key).__name__}.\")\n\tdef __getattr__(self,name):\n\t\tif name.startswith(_B):return self.get_event(name)\n\t\tdom_name=self._normalize_attribute_name(name);return getattr(self._dom_element,dom_name)\n\tdef __setattr__(self,name,value):\n\t\tif name.startswith('_'):super().__setattr__(name,value)\n\t\telif name.startswith(_B):self.get_event(name).add_listener(value)\n\t\telse:dom_name=self._normalize_attribute_name(name);setattr(self._dom_element,dom_name,value)\n\tdef _normalize_attribute_name(self,name):\n\t\tif name.endswith('_'):name=name[:-1]\n\t\tif name=='for':return'htmlFor'\n\t\tif name=='class':return'className'\n\t\treturn name\n\tdef get_event(self,name):\n\t\tif not name.startswith(_B):raise ValueError(\"Event names must start with 'on_'.\")\n\t\tevent_name=name[3:]\n\t\tif not hasattr(self._dom_element,event_name):raise ValueError(f\"Element has no '{event_name}' event.\")\n\t\tif name in self._on_events:return self._on_events[name]\n\t\tev=Event();self._on_events[name]=ev;self._dom_element.addEventListener(event_name,create_proxy(ev.trigger));return ev\n\t@property\n\tdef children(self):return ElementCollection.wrap_dom_elements(self._dom_element.children)\n\t@property\n\tdef classes(self):\n\t\tif not hasattr(self,'_classes'):self._classes=Classes(self)\n\t\treturn self._classes\n\t@property\n\tdef style(self):\n\t\tif not hasattr(self,'_style'):self._style=Style(self)\n\t\treturn self._style\n\t@property\n\tdef parent(self):\n\t\tif is_none(self._dom_element.parentElement):return\n\t\treturn Element.wrap_dom_element(self._dom_element.parentElement)\n\tdef append(self,*items):\n\t\tfor item in items:\n\t\t\tif isinstance(item,Element):self._dom_element.appendChild(item._dom_element)\n\t\t\telif isinstance(item,ElementCollection):\n\t\t\t\tfor element in item:self._dom_element.appendChild(element._dom_element)\n\t\t\telif isinstance(item,(list,tuple)):\n\t\t\t\tfor child in item:self.append(child)\n\t\t\telif hasattr(item,_C):self._dom_element.appendChild(item)\n\t\t\telif hasattr(item,'length'):\n\t\t\t\tfor element in item:self._dom_element.appendChild(element)\n\t\t\telse:raise TypeError(f\"Cannot append {type(item).__name__} to element.\")\n\tdef clone(self,clone_id=_A):clone=Element.wrap_dom_element(self._dom_element.cloneNode(True));clone.id=clone_id;return clone\n\tdef find(self,selector):return _find_and_wrap(self._dom_element,selector)\n\tdef show_me(self):self._dom_element.scrollIntoView()\n\tdef update(self,classes=_A,style=_A,**kwargs):\n\t\tif classes:\n\t\t\tif isinstance(classes,str):self.classes.add(classes)\n\t\t\telse:\n\t\t\t\tfor class_name in classes:self.classes.add(class_name)\n\t\tif style:\n\t\t\tfor(key,value)in style.items():self.style[key]=value\n\t\tfor(name,value)in kwargs.items():setattr(self,name,value)\nclass Classes(set):\n\tdef __init__(self,element):self._class_list=element._dom_element.classList;super().__init__(self._class_list)\n\tdef _extract_class_names(self,class_name):return[name for name in class_name.split()if name]if' 'in class_name else[class_name]\n\tdef add(self,class_name):\n\t\tfor name in self._extract_class_names(class_name):super().add(name);self._class_list.add(name)\n\tdef remove(self,class_name):\n\t\tfor name in self._extract_class_names(class_name):super().remove(name);self._class_list.remove(name)\n\tdef discard(self,class_name):\n\t\tfor name in self._extract_class_names(class_name):\n\t\t\tsuper().discard(name)\n\t\t\tif name in self._class_list:self._class_list.remove(name)\n\tdef clear(self):\n\t\tsuper().clear()\n\t\twhile self._class_list.length>0:self._class_list.remove(self._class_list.item(0))\nclass Style(dict):\n\tdef __init__(self,element):self._style=element._dom_element.style;super().__init__()\n\tdef __setitem__(self,key,value):super().__setitem__(key,value);self._style.setProperty(key,str(value))\n\tdef __delitem__(self,key):super().__delitem__(key);self._style.removeProperty(key)\nclass HasOptions:\n\t@property\n\tdef options(self):\n\t\tif not hasattr(self,'_options'):self._options=Options(self)\n\t\treturn self._options\nclass Options:\n\tdef __init__(self,element):self._element=element\n\tdef __getitem__(self,key):return self.options[key]\n\tdef __iter__(self):yield from self.options\n\tdef __len__(self):return len(self.options)\n\tdef __repr__(self):return f\"{self.__class__.__name__} (length: {len(self)}) {self.options}\"\n\t@property\n\tdef options(self):return[Element.wrap_dom_element(o)for o in self._element._dom_element.options]\n\t@property\n\tdef selected(self):return self.options[self._element._dom_element.selectedIndex]\n\tdef add(self,value=_A,html=_A,text=_A,before=_A,**kwargs):\n\t\tif value:kwargs['value']=value\n\t\tif html:kwargs['innerHTML']=html\n\t\tif text:kwargs['text']=text\n\t\tnew_option=option(**kwargs)\n\t\tif before and isinstance(before,Element):before=before._dom_element\n\t\tself._element._dom_element.add(new_option._dom_element,before)\n\tdef clear(self):self._element._dom_element.length=0\n\tdef remove(self,index):self._element._dom_element.remove(index)\nclass ContainerElement(Element):\n\tdef __init__(self,*args,children=_A,dom_element=_A,style=_A,classes=_A,**kwargs):\n\t\tsuper().__init__(dom_element=dom_element,style=style,classes=classes,**kwargs)\n\t\tfor child in list(args)+(children or[]):\n\t\t\tif isinstance(child,(Element,ElementCollection)):self.append(child)\n\t\t\telse:self._dom_element.insertAdjacentHTML('beforeend',child)\n\tdef __iter__(self):yield from self.children\nclass ElementCollection:\n\t@classmethod\n\tdef wrap_dom_elements(cls,dom_elements):return cls([Element.wrap_dom_element(dom_element)for dom_element in dom_elements])\n\tdef __init__(self,elements):self._elements=elements\n\tdef __eq__(self,obj):return isinstance(obj,ElementCollection)and obj._elements==self._elements\n\tdef __getitem__(self,key):\n\t\tif isinstance(key,int):return self._elements[key]\n\t\tif isinstance(key,slice):return ElementCollection(self._elements[key])\n\t\tif isinstance(key,str):\n\t\t\tfor element in self._elements:\n\t\t\t\tresult=_find_by_id(element._dom_element,key)\n\t\t\t\tif result:return result\n\t\t\treturn\n\t\traise TypeError(f\"Collection indices must be integers, slices, or strings, not {type(key).__name__}\")\n\tdef __iter__(self):yield from self._elements\n\tdef __len__(self):return len(self._elements)\n\tdef __repr__(self):return f\"{self.__class__.__name__} (length: {len(self._elements)}) {self._elements}\"\n\t@property\n\tdef elements(self):return self._elements\n\tdef find(self,selector):\n\t\telements=[]\n\t\tfor element in self._elements:elements.extend(_find_and_wrap(element._dom_element,selector))\n\t\treturn ElementCollection(elements)\n\tdef update_all(self,**kwargs):\n\t\tfor element in self._elements:\n\t\t\tfor(name,value)in kwargs.items():setattr(element,name,value)\nclass canvas(ContainerElement):\n\tdef download(self,filename='snapped.png'):download_link=a(download=filename,href=self._dom_element.toDataURL());self.append(download_link);download_link._dom_element.click()\n\tdef draw(self,what,width=_A,height=_A):\n\t\tif isinstance(what,Element):what=what._dom_element\n\t\tctx=self._dom_element.getContext('2d')\n\t\tif width or height:ctx.drawImage(what,0,0,width,height)\n\t\telse:ctx.drawImage(what,0,0)\nclass video(ContainerElement):\n\tdef snap(self,to=_A,width=_A,height=_A):\n\t\tB='CANVAS';A='Element to snap to must be a canvas.';width=width if width else self.videoWidth;height=height if height else self.videoHeight\n\t\tif is_none(to):to=canvas(width=width,height=height)\n\t\telif isinstance(to,Element):\n\t\t\tif to.tag!='canvas':raise TypeError(A)\n\t\telif getattr(to,_C,'')==B:to=canvas(dom_element=to)\n\t\telif isinstance(to,str):\n\t\t\tnodelist=document.querySelectorAll(to)\n\t\t\tif nodelist.length==0:raise TypeError(f\"No element with selector {to} to snap to.\")\n\t\t\tif nodelist[0].tagName!=B:raise TypeError(A)\n\t\t\tto=canvas(dom_element=nodelist[0])\n\t\tto.draw(self,width,height);return to\nclass datalist(ContainerElement,HasOptions):0\nclass optgroup(ContainerElement,HasOptions):0\nclass select(ContainerElement,HasOptions):0\nCONTAINER_TAGS=['a','abbr','address','article','aside','audio','b','blockquote','body','button','caption','cite','code','colgroup','data','dd','del','details','dialog','div','dl','dt','em','fieldset','figcaption','figure','footer','form','h1','h2','h3','h4','h5','h6','head','header','hgroup','html','i','iframe','ins','kbd','label','legend','li','main','map','mark','menu','meta','meter','nav',_D,'ol','option','output','p','param','picture','pre','progress','q','s','script','section','small','span','strong','style','sub','summary','sup','table','tbody','td','template','textarea','tfoot','th','thead','time','title','tr','u','ul','var','wbr']\nVOID_TAGS=['area','base','br','col','embed','hr','img','input','link','source','track']\ndef _create_element_classes():\n\tA='__doc__';classes=[canvas,video,datalist,optgroup,select]\n\tfor tag in CONTAINER_TAGS:class_name=f\"{tag}_\"if tag in('del','map',_D)else tag;doc=f\"HTML <{tag}> element. Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/{tag}\";cls=type(class_name,(ContainerElement,),{A:doc});globals()[class_name]=cls;classes.append(cls)\n\tfor tag in VOID_TAGS:class_name=f\"{tag}_\"if tag=='input'else tag;doc=f\"HTML <{tag}> element. Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/{tag}\";cls=type(class_name,(Element,),{A:doc});globals()[class_name]=cls;classes.append(cls)\n\tElement.register_element_classes(classes)\n_create_element_classes()\nclass Page:\n\tdef __init__(self):self.html=Element.wrap_dom_element(document.documentElement);self.body=Element.wrap_dom_element(document.body);self.head=Element.wrap_dom_element(document.head)\n\tdef __getitem__(self,key):return _find_by_id(document,key)\n\t@property\n\tdef title(self):return document.title\n\t@title.setter\n\tdef title(self,value):document.title=value\n\tdef append(self,*items):self.body.append(*items)\n\tdef find(self,selector):return _find_and_wrap(document,selector)\npage=Page()",
+    "websocket.py": "import js\nfrom pyscript.ffi import create_proxy\nfrom pyscript.util import as_bytearray,is_awaitable\ndef _attach_event_handler(websocket,handler_name,handler_function):\n\tA=handler_function\n\tif is_awaitable(A):\n\t\tasync def C(event):await A(WebSocketEvent(event))\n\t\tB=create_proxy(C)\n\telse:B=create_proxy(lambda event:A(WebSocketEvent(event)))\n\tsetattr(websocket,handler_name,B)\nclass WebSocketEvent:\n\tdef __init__(A,event):A._event=event\n\tdef __getattr__(B,attr):\n\t\tA=getattr(B._event,attr)\n\t\tif attr=='data'and not isinstance(A,str):\n\t\t\tif hasattr(A,'to_py'):return A.to_py()\n\t\t\telse:return memoryview(as_bytearray(A))\n\t\treturn A\nclass WebSocket:\n\tCONNECTING=0;OPEN=1;CLOSING=2;CLOSED=3\n\tdef __init__(B,url,protocols=None,**D):\n\t\tC=protocols\n\t\tif C:A=js.WebSocket.new(url,C)\n\t\telse:A=js.WebSocket.new(url)\n\t\tA.binaryType='arraybuffer';object.__setattr__(B,'_js_websocket',A)\n\t\tfor(E,F)in D.items():setattr(B,E,F)\n\tdef __getattr__(A,attr):return getattr(A._js_websocket,attr)\n\tdef __setattr__(B,attr,value):\n\t\tC=value;A=attr\n\t\tif A in['onclose','onerror','onmessage','onopen']:_attach_event_handler(B._js_websocket,A,C)\n\t\telse:setattr(B._js_websocket,A,C)\n\tdef send(B,data):\n\t\tA=data\n\t\tif isinstance(A,str):B._js_websocket.send(A)\n\t\telse:\n\t\t\tC=js.Uint8Array.new(len(A))\n\t\t\tfor(D,E)in enumerate(A):C[D]=E\n\t\t\tB._js_websocket.send(C)\n\tdef close(B,code=None,reason=None):\n\t\tC=reason;A=code\n\t\tif A and C:B._js_websocket.close(A,C)\n\t\telif A:B._js_websocket.close(A)\n\t\telse:B._js_websocket.close()",
+    "workers.py": "import js,json\nfrom polyscript import workers as _polyscript_workers\nclass _ReadOnlyWorkersProxy:\n\tdef __getitem__(A,name):return js.Reflect.get(_polyscript_workers,name)\n\tdef __getattr__(A,name):return js.Reflect.get(_polyscript_workers,name)\nworkers=_ReadOnlyWorkersProxy()\nasync def create_named_worker(src,name,config=None,type='py'):\n\tB=config;A=js.document.createElement('script');A.type=type;A.src=src;A.setAttribute('worker','');A.setAttribute('name',name)\n\tif B:\n\t\tif isinstance(B,str):C=B\n\t\telse:C=json.dumps(B)\n\t\tA.setAttribute('config',C)\n\tjs.document.body.append(A);return await workers[name]"
   }
 };
diff --git a/core/src/stdlib/pyscript/__init__.py b/core/src/stdlib/pyscript/__init__.py
index dd0ee911..644ec565 100644
--- a/core/src/stdlib/pyscript/__init__.py
+++ b/core/src/stdlib/pyscript/__init__.py
@@ -1,36 +1,105 @@
-# Some notes about the naming conventions and the relationship between various
-# similar-but-different names.
-#
-# import pyscript
-#     this package contains the main user-facing API offered by pyscript. All
-#     the names which are supposed be used by end users should be made
-#     available in pyscript/__init__.py (i.e., this file)
-#
-# import _pyscript
-#     this is an internal module implemented in JS. It is used internally by
-#     the pyscript package, end users should not use it directly. For its
-#     implementation, grep for `interpreter.registerJsModule("_pyscript",
-#     ...)` in core.js
-#
-# import js
-#     this is the JS globalThis, as exported by pyodide and/or micropython's
-#     FFIs. As such, it contains different things in the main thread or in a
-#     worker.
-#
-# import pyscript.magic_js
-#     this submodule abstracts away some of the differences between the main
-#     thread and the worker. In particular, it defines `window` and `document`
-#     in such a way that these names work in both cases: in the main thread,
-#     they are the "real" objects, in the worker they are proxies which work
-#     thanks to coincident.
-#
-# from pyscript import window, document
-#     these are just the window and document objects as defined by
-#     pyscript.magic_js. This is the blessed way to access them from pyscript,
-#     as it works transparently in both the main thread and worker cases.
+"""
+This is the main `pyscript` namespace. It provides the primary Pythonic API
+for users to interact with the
+[browser's own API](https://developer.mozilla.org/en-US/docs/Web/API). It
+includes utilities for common activities such as displaying content, handling
+events, fetching resources, managing local storage, and coordinating with
+web workers.
+
+The most important names provided by this namespace can be directly imported
+from `pyscript`, for example:
+
+```python
+from pyscript import display, HTML, fetch, when, storage, WebSocket
+```
+
+The following names are available in the `pyscript` namespace:
+
+- `RUNNING_IN_WORKER`: Boolean indicating if the code is running in a Web
+  Worker.
+- `PyWorker`: Class for creating Web Workers running Python code.
+- `config`: Configuration object for pyscript settings.
+- `current_target`: The element in the DOM that is the current target for
+  output.
+- `document`: The standard `document` object, proxied in workers.
+- `window`: The standard `window` object, proxied in workers.
+- `js_import`: Function to dynamically import JS modules.
+- `js_modules`: Object containing JS modules available to Python.
+- `sync`: Utility for synchronizing between worker and main thread.
+- `display`: Function to render Python objects in the web page.
+- `HTML`: Helper class to create HTML content for display.
+- `fetch`: Function to perform HTTP requests.
+- `Storage`: Class representing browser storage (local/session).
+- `storage`: Object to interact with browser's local storage.
+- `WebSocket`: Class to create and manage WebSocket connections.
+- `when`: Function to register event handlers on DOM elements.
+- `Event`: Class representing user defined or DOM events.
+- `py_import`: Function to lazily import Pyodide related Python modules.
+
+If running in the main thread, the following additional names are available:
+
+- `create_named_worker`: Function to create a named Web Worker.
+- `workers`: Object to manage and interact with existing Web Workers.
+
+All of these names are defined in the various submodules of `pyscript` and
+are imported and re-exported here for convenience. Please refer to the
+respective submodule documentation for more details on each component.
+
+
+!!! Note
+    Some notes about the naming conventions and the relationship between
+    various similar-but-different names found within this code base.
+
+    ```python
+    import pyscript
+    ```
+
+    The `pyscript` package contains the main user-facing API offered by
+    PyScript. All the names which are supposed be used by end users should
+    be made available in `pyscript/__init__.py` (i.e., this source file).
+
+    ```python
+    import _pyscript
+    ```
+
+    The `_pyscript` module is an internal API implemented in JS. **End users
+    should not use it directly**. For its implementation, grep for
+    `interpreter.registerJsModule("_pyscript",...)` in `core.js`.
+
+    ```python
+    import js
+    ```
+
+    The `js` object is
+    [the JS `globalThis`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/globalThis),
+    as exported by Pyodide and/or Micropython's foreign function interface
+    (FFI). As such, it contains different things in the main thread or in a
+    worker, as defined by web standards.
+
+    ```python
+    import pyscript.context
+    ```
+
+    The `context` submodule abstracts away some of the differences between
+    the main thread and a worker. Its most important features are made
+    available in the root `pyscript` namespace. All other functionality is
+    mostly for internal PyScript use or advanced users. In particular, it
+    defines `window` and `document` in such a way that these names work in
+    both cases: in the main thread, they are the "real" objects, in a worker
+    they are proxies which work thanks to
+    [coincident](https://github.com/WebReflection/coincident).
+
+    ```python
+    from pyscript import window, document
+    ```
+
+    These are just the `window` and `document` objects as defined by
+    `pyscript.context`. This is the blessed way to access them from `pyscript`,
+    as it works transparently in both the main thread and worker cases.
+"""
 
 from polyscript import lazy_py_modules as py_import
-from pyscript.magic_js import (
+from pyscript.context import (
     RUNNING_IN_WORKER,
     PyWorker,
     config,
diff --git a/core/src/stdlib/pyscript/context.py b/core/src/stdlib/pyscript/context.py
new file mode 100644
index 00000000..b3f775c9
--- /dev/null
+++ b/core/src/stdlib/pyscript/context.py
@@ -0,0 +1,198 @@
+"""
+Execution context management for PyScript.
+
+This module handles the differences between running in the
+[main browser thread](https://developer.mozilla.org/en-US/docs/Glossary/Main_thread)
+versus running in a
+[Web Worker](https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API/Using_web_workers),
+providing a consistent API regardless of the execution context.
+
+Key features:
+
+- Detects whether code is running in a worker or main thread. Read this via
+  the boolean `pyscript.context.RUNNING_IN_WORKER`.
+- Parses and normalizes configuration from `polyscript.config` and adds the
+  Python interpreter type via the `type` key in `pyscript.context.config`.
+- Provides appropriate implementations of `window`, `document`, and `sync`.
+- Sets up JavaScript module import system, including a lazy `js_import`
+  function.
+- Manages `PyWorker` creation.
+- Provides access to the current display target via
+  `pyscript.context.display_target`.
+
+!!! warning
+
+    These are key differences between the main thread and worker contexts:
+
+    Main thread context:
+
+    - `window` and `document` are available directly.
+    - `PyWorker` can be created to spawn worker threads.
+    - `sync` is not available (raises `NotSupported`).
+
+    Worker context:
+
+    - `window` and `document` are proxied from main thread (if SharedArrayBuffer
+    available).
+    - `PyWorker` is not available (raises `NotSupported`).
+    - `sync` utilities are available for main thread communication.
+"""
+
+import json
+import sys
+
+import js
+from polyscript import config as _polyscript_config
+from polyscript import js_modules
+from pyscript.util import NotSupported
+
+RUNNING_IN_WORKER = not hasattr(js, "document")
+"""Detect execution context: True if running in a worker, False if main thread."""
+
+config = json.loads(js.JSON.stringify(_polyscript_config))
+"""Parsed and normalized configuration."""
+if isinstance(config, str):
+    config = {}
+
+js_import = None
+"""Function to import JavaScript modules dynamically."""
+
+window = None
+"""The `window` object (proxied if in a worker)."""
+
+document = None
+"""The `document` object (proxied if in a worker)."""
+
+sync = None
+"""Sync utilities for worker-main thread communication (only in workers)."""
+
+# Detect and add Python interpreter type to config.
+if "MicroPython" in sys.version:
+    config["type"] = "mpy"
+else:
+    config["type"] = "py"
+
+
+class _JSModuleProxy:
+    """
+    Proxy for JavaScript modules imported via js_modules.
+
+    This allows Python code to import JavaScript modules using Python's
+    import syntax:
+
+    ```python
+    from pyscript.js_modules lodash import debounce
+    ```
+
+    The proxy lazily retrieves the actual JavaScript module when accessed.
+    """
+
+    def __init__(self, name):
+        """
+        Create a proxy for the named JavaScript module.
+        """
+        self.name = name
+
+    def __getattr__(self, field):
+        """
+        Retrieve a JavaScript object/function from the proxied JavaScript
+        module via the given `field` name.
+        """
+        # Avoid Pyodide looking for non-existent special methods.
+        if not field.startswith("_"):
+            return getattr(getattr(js_modules, self.name), field)
+        return None
+
+
+# Register all available JavaScript modules in Python's module system.
+# This enables: from pyscript.js_modules.xxx import yyy
+for module_name in js.Reflect.ownKeys(js_modules):
+    sys.modules[f"pyscript.js_modules.{module_name}"] = _JSModuleProxy(module_name)
+sys.modules["pyscript.js_modules"] = js_modules
+
+
+# Context-specific setup: Worker vs Main Thread.
+if RUNNING_IN_WORKER:
+    import polyscript
+
+    # PyWorker cannot be created from within a worker.
+    PyWorker = NotSupported(
+        "pyscript.PyWorker",
+        "pyscript.PyWorker works only when running in the main thread",
+    )
+
+    # Attempt to access main thread's window and document via SharedArrayBuffer.
+    try:
+        window = polyscript.xworker.window
+        document = window.document
+        js.document = document
+
+        # Create js_import function that runs imports on the main thread.
+        js_import = window.Function(
+            "return (...urls) => Promise.all(urls.map((url) => import(url)))"
+        )()
+
+    except:
+        # SharedArrayBuffer not available - window/document cannot be proxied.
+        sab_error_message = (
+            "Unable to use `window` or `document` in worker. "
+            "This requires SharedArrayBuffer support. "
+            "See: https://docs.pyscript.net/latest/faq/#sharedarraybuffer"
+        )
+        js.console.warn(sab_error_message)
+        window = NotSupported("pyscript.window", sab_error_message)
+        document = NotSupported("pyscript.document", sab_error_message)
+
+    # Worker-specific utilities for main thread communication.
+    sync = polyscript.xworker.sync
+
+    def current_target():
+        """
+        Get the current output target in worker context.
+        """
+        return polyscript.target
+
+else:
+    # Main thread context setup.
+    import _pyscript
+    from _pyscript import PyWorker as _PyWorker
+    from pyscript.ffi import to_js
+
+    js_import = _pyscript.js_import
+
+    def PyWorker(url, **options):
+        """
+        Create a Web Worker running Python code.
+
+        This spawns a new worker thread that can execute Python code
+        found at the `url`, independently of the main thread. The
+        `**options` can be used to configure the worker.
+
+        ```python
+        from pyscript import PyWorker
+
+
+        # Create a worker to run background tasks.
+        # (`type` MUST be either `micropython` or `pyodide`)
+        worker = PyWorker("./worker.py", type="micropython")
+        ```
+
+        PyWorker **can only be created from the main thread**, not from
+        within another worker.
+        """
+        return _PyWorker(url, to_js(options))
+
+    # Main thread has direct access to window and document.
+    window = js
+    document = js.document
+
+    # sync is not available in main thread (only in workers).
+    sync = NotSupported(
+        "pyscript.sync", "pyscript.sync works only when running in a worker"
+    )
+
+    def current_target():
+        """
+        Get the current output target in main thread context.
+        """
+        return _pyscript.target
diff --git a/core/src/stdlib/pyscript/display.py b/core/src/stdlib/pyscript/display.py
index 4f1986f8..8ea44af4 100644
--- a/core/src/stdlib/pyscript/display.py
+++ b/core/src/stdlib/pyscript/display.py
@@ -1,64 +1,104 @@
+"""
+Display Pythonic content in the browser.
+
+This module provides the `display()` function for rendering Python objects
+in the web page. The function introspects objects to determine the appropriate
+[MIME type](https://developer.mozilla.org/en-US/docs/Web/HTTP/Guides/MIME_types/Common_types)
+and rendering method.
+
+Supported MIME types:
+
+- `text/plain`: Plain text (HTML-escaped)
+- `text/html`: HTML content
+- `image/png`: PNG images as data URLs
+- `image/jpeg`: JPEG images as data URLs
+- `image/svg+xml`: SVG graphics
+- `application/json`: JSON data
+- `application/javascript`: JavaScript code (discouraged)
+
+The `display()` function uses standard Python representation methods
+(`_repr_html_`, `_repr_png_`, etc.) to determine how to render objects.
+Objects can provide a `_repr_mimebundle_` method to specify preferred formats
+like this:
+
+```python
+def _repr_mimebundle_(self):
+    return {
+        "text/html": "<b>Bold HTML</b>",
+        "image/png": "<base64-encoded-png-data>",
+    }
+```
+
+Heavily inspired by
+[IPython's rich display system](https://ipython.readthedocs.io/en/stable/api/generated/IPython.display.html).
+"""
+
 import base64
 import html
 import io
-import re
-
-from pyscript.magic_js import current_target, document, window
+from collections import OrderedDict
+from pyscript.context import current_target, document, window
 from pyscript.ffi import is_none
 
-_MIME_METHODS = {
-    "savefig": "image/png",
-    "_repr_javascript_": "application/javascript",
-    "_repr_json_": "application/json",
-    "_repr_latex": "text/latex",
-    "_repr_png_": "image/png",
-    "_repr_jpeg_": "image/jpeg",
-    "_repr_pdf_": "application/pdf",
-    "_repr_svg_": "image/svg+xml",
-    "_repr_markdown_": "text/markdown",
-    "_repr_html_": "text/html",
-    "__repr__": "text/plain",
-}
-
 
 def _render_image(mime, value, meta):
-    # If the image value is using bytes we should convert it to base64
-    # otherwise it will return raw bytes and the browser will not be able to
-    # render it.
+    """
+    Render image (`mime`) data (`value`) as an HTML img element with data URL.
+    Any `meta` attributes are added to the img tag.
+
+    Accepts both raw bytes and base64-encoded strings for flexibility. This
+    only handles PNG and JPEG images. SVG images are handled separately as
+    their raw XML content (which the browser can render directly).
+    """
     if isinstance(value, bytes):
         value = base64.b64encode(value).decode("utf-8")
-
-    # This is the pattern of base64 strings
-    base64_pattern = re.compile(
-        r"^([A-Za-z0-9+/]{4})*([A-Za-z0-9+/]{3}=|[A-Za-z0-9+/]{2}==)?$"
-    )
-    # If value doesn't match the base64 pattern we should encode it to base64
-    if len(value) > 0 and not base64_pattern.match(value):
-        value = base64.b64encode(value.encode("utf-8")).decode("utf-8")
-
-    data = f"data:{mime};charset=utf-8;base64,{value}"
-    attrs = " ".join(['{k}="{v}"' for k, v in meta.items()])
-    return f'<img src="{data}" {attrs}></img>'
+    attrs = "".join([f' {k}="{v}"' for k, v in meta.items()])
+    return f'<img src="data:{mime};base64,{value}"{attrs}>'
 
 
-def _identity(value, meta):
-    return value
-
-
-_MIME_RENDERERS = {
-    "text/plain": html.escape,
-    "text/html": _identity,
-    "image/png": lambda value, meta: _render_image("image/png", value, meta),
-    "image/jpeg": lambda value, meta: _render_image("image/jpeg", value, meta),
-    "image/svg+xml": _identity,
-    "application/json": _identity,
-    "application/javascript": lambda value, meta: f"<script>{value}<\\/script>",
+# Maps MIME types to rendering functions.
+_MIME_TO_RENDERERS = {
+    "text/plain": lambda v, m: html.escape(v),
+    "text/html": lambda v, m: v,
+    "image/png": lambda v, m: _render_image("image/png", v, m),
+    "image/jpeg": lambda v, m: _render_image("image/jpeg", v, m),
+    "image/svg+xml": lambda v, m: v,
+    "application/json": lambda v, m: v,
+    "application/javascript": lambda v, m: f"<script>{v}<\\/script>",
 }
 
 
+# Maps Python representation methods to MIME types. This is an ordered dict
+# because the order defines preference when multiple methods are available,
+# and MicroPython's limited dicts don't preserve insertion order.
+_METHOD_TO_MIME = OrderedDict(
+    [
+        ("savefig", "image/png"),
+        ("_repr_png_", "image/png"),
+        ("_repr_jpeg_", "image/jpeg"),
+        ("_repr_svg_", "image/svg+xml"),
+        ("_repr_html_", "text/html"),
+        ("_repr_json_", "application/json"),
+        ("_repr_javascript_", "application/javascript"),
+        ("__repr__", "text/plain"),
+    ]
+)
+
+
 class HTML:
     """
-    Wrap a string so that display() can render it as plain HTML
+    Wrap a string to render as unescaped HTML in `display()`. This is
+    necessary because plain strings are automatically HTML-escaped for safety:
+
+    ```python
+    from pyscript import HTML, display
+
+
+    display(HTML("<h1>Hello World</h1>"))
+    ```
+
+    Inspired by
+    [`IPython.display.HTML`](https://ipython.readthedocs.io/en/stable/api/generated/IPython.display.html#IPython.display.HTML).
     """
 
     def __init__(self, html):
@@ -68,112 +108,156 @@ class HTML:
         return self._html
 
 
-def _eval_formatter(obj, print_method):
+def _get_representation(obj, method):
     """
-    Evaluates a formatter method.
+    Call the given representation `method` on an object (`obj`).
+
+    Handles special cases like matplotlib's `savefig`. Returns `None`
+    if the `method` doesn't exist.
     """
-    if print_method == "__repr__":
+    if method == "__repr__":
         return repr(obj)
-    if hasattr(obj, print_method):
-        if print_method == "savefig":
-            buf = io.BytesIO()
-            obj.savefig(buf, format="png")
-            buf.seek(0)
-            return base64.b64encode(buf.read()).decode("utf-8")
-        return getattr(obj, print_method)()
-    if print_method == "_repr_mimebundle_":
-        return {}, {}
-    return None
+    if not hasattr(obj, method):
+        return None
+    if method == "savefig":
+        buf = io.BytesIO()
+        obj.savefig(buf, format="png")
+        buf.seek(0)
+        return base64.b64encode(buf.read()).decode("utf-8")
+    return getattr(obj, method)()
 
 
-def _format_mime(obj):
+def _get_content_and_mime(obj):
     """
-    Formats object using _repr_x_ methods.
+    Returns the formatted raw content to be inserted into the DOM representing
+    the given object, along with the object's detected MIME type.
+
+    Returns a tuple of (html_string, mime_type).
+
+    Prefers _repr_mimebundle_ if available, otherwise tries individual
+    representation methods, falling back to __repr__ (with a warning in
+    the console).
+
+    Implements a subset of IPython's rich display system (mimebundle support,
+    etc...).
     """
     if isinstance(obj, str):
         return html.escape(obj), "text/plain"
-
-    mimebundle = _eval_formatter(obj, "_repr_mimebundle_")
-    if isinstance(mimebundle, tuple):
-        format_dict, _ = mimebundle
-    else:
-        format_dict = mimebundle
-
-    output, not_available = None, []
-    for method, mime_type in _MIME_METHODS.items():
-        if mime_type in format_dict:
-            output = format_dict[mime_type]
+    # Prefer an object's mimebundle.
+    mimebundle = _get_representation(obj, "_repr_mimebundle_")
+    if mimebundle:
+        if isinstance(mimebundle, tuple):
+            # Grab global metadata.
+            format_dict, global_meta = mimebundle
         else:
-            output = _eval_formatter(obj, method)
-
-        if is_none(output):
+            format_dict, global_meta = mimebundle, {}
+        # Try to render using mimebundle formats.
+        for mime_type, output in format_dict.items():
+            if mime_type in _MIME_TO_RENDERERS:
+                meta = global_meta.get(mime_type, {})
+                # If output is a tuple, merge format-specific metadata.
+                if isinstance(output, tuple):
+                    output, format_meta = output
+                    meta.update(format_meta)
+                return _MIME_TO_RENDERERS[mime_type](output, meta), mime_type
+    # No mimebundle or no available renderers therein, so try individual
+    # methods.
+    for method, mime_type in _METHOD_TO_MIME.items():
+        if mime_type not in _MIME_TO_RENDERERS:
             continue
-        if mime_type not in _MIME_RENDERERS:
-            not_available.append(mime_type)
+        output = _get_representation(obj, method)
+        if output is None:
             continue
-        break
-    if is_none(output):
-        if not_available:
-            window.console.warn(
-                f"Rendered object requested unavailable MIME renderers: {not_available}"
-            )
-        output = repr(output)
-        mime_type = "text/plain"
-    elif isinstance(output, tuple):
-        output, meta = output
-    else:
         meta = {}
-    return _MIME_RENDERERS[mime_type](output, meta), mime_type
+        if isinstance(output, tuple):
+            output, meta = output
+        return _MIME_TO_RENDERERS[mime_type](output, meta), mime_type
+    # Ultimate fallback to repr with warning.
+    window.console.warn(
+        f"Object {type(obj).__name__} has no supported representation method. "
+        "Using __repr__ as fallback."
+    )
+    output = repr(obj)
+    return html.escape(output), "text/plain"
 
 
-def _write(element, value, append=False):
-    html, mime_type = _format_mime(value)
-    if html == "\\n":
+def _write_to_dom(element, value, append):
+    """
+    Given an `element` and a `value`, write formatted content to the referenced
+    DOM element. If `append` is True, content is added to the existing content;
+    otherwise, the existing content is replaced.
+
+    Creates a wrapper `div` when appending multiple items to preserve
+    structure.
+    """
+    html_content, mime_type = _get_content_and_mime(value)
+    if not html_content.strip():
         return
-
     if append:
-        out_element = document.createElement("div")
-        element.append(out_element)
+        container = document.createElement("div")
+        element.append(container)
     else:
-        out_element = element.lastElementChild
-        if is_none(out_element):
-            out_element = element
-
+        container = element
     if mime_type in ("application/javascript", "text/html"):
-        script_element = document.createRange().createContextualFragment(html)
-        out_element.append(script_element)
+        container.append(document.createRange().createContextualFragment(html_content))
     else:
-        out_element.innerHTML = html
+        container.innerHTML = html_content
 
 
 def display(*values, target=None, append=True):
-    if is_none(target):
+    """
+    Display Python objects in the web page.
+
+    * `*values`: Python objects to display. Each object is introspected to
+      determine the appropriate rendering method.
+    * `target`: DOM element ID where content should be displayed. If `None`
+      (default), uses the current script tag's designated output area. This
+      can start with '#' (which will be stripped for compatibility).
+    * `append`: If `True` (default), add content to existing output. If
+      `False`, replace existing content before displaying.
+
+    When used in a worker, `display()` requires an explicit `target` parameter
+    to identify where content will be displayed. If used on the main thread,
+    it automatically uses the current `<script>` tag as the target. If the
+    script tag has a `target` attribute, that element will be used instead.
+
+    A ValueError is raised if a valid target cannot be found for the current
+    context.
+
+    ```python
+    from pyscript import display, HTML
+
+
+    # Display raw HTML.
+    display(HTML("<h1>Hello, World!</h1>"))
+
+    # Display in current script's output area.
+    display("Hello, World!")
+
+    # Display in a specific element.
+    display("Hello", target="my-div")
+
+    # Replace existing content (note the `#`).
+    display("New content", target="#my-div", append=False)
+
+    # Display multiple values in the default target.
+    display("First", "Second", "Third")
+    ```
+    """
+    if isinstance(target, str):
+        # There's a valid target.
+        target = target[1:] if target.startswith("#") else target
+    elif is_none(target):
         target = current_target()
-    elif not isinstance(target, str):
-        msg = f"target must be str or None, not {target.__class__.__name__}"
-        raise TypeError(msg)
-    elif target == "":
-        msg = "Cannot have an empty target"
-        raise ValueError(msg)
-    elif target.startswith("#"):
-        # note: here target is str and not None!
-        # align with @when behavior
-        target = target[1:]
-
     element = document.getElementById(target)
-
-    # If target cannot be found on the page, a ValueError is raised
     if is_none(element):
-        msg = f"Invalid selector with id={target}. Cannot be found in the page."
-        raise ValueError(msg)
-
-    # if element is a <script type="py">, it has a 'target' attribute which
-    # points to the visual element holding the displayed values. In that case,
-    # use that.
+        raise ValueError(f"Cannot find element with id='{target}' in the page.")
+    # If possible, use a script tag's target attribute.
     if element.tagName == "SCRIPT" and hasattr(element, "target"):
         element = element.target
-
-    for v in values:
-        if not append:
-            element.replaceChildren()
-        _write(element, v, append=append)
+    # Clear before displaying all values when not appending.
+    if not append:
+        element.replaceChildren()
+    # Add each value.
+    for value in values:
+        _write_to_dom(element, value, append)
diff --git a/core/src/stdlib/pyscript/events.py b/core/src/stdlib/pyscript/events.py
index 7433ac55..e40de4f1 100644
--- a/core/src/stdlib/pyscript/events.py
+++ b/core/src/stdlib/pyscript/events.py
@@ -1,17 +1,47 @@
+"""
+Event handling for PyScript.
+
+This module provides two complementary systems:
+
+1. The `Event` class: A simple publish-subscribe pattern for custom events
+   within *your* Python code.
+
+2. The `@when` decorator: Connects Python functions to browser DOM events,
+   or instances of the `Event` class, allowing you to respond to user
+   interactions like clicks, key presses and form submissions, or to custom
+   events defined in your Python code.
+"""
+
 import asyncio
 import inspect
-import sys
-
 from functools import wraps
-from pyscript.magic_js import document
-from pyscript.ffi import create_proxy
+from pyscript.context import document
+from pyscript.ffi import create_proxy, to_js
 from pyscript.util import is_awaitable
-from pyscript import config
 
 
 class Event:
     """
-    Represents something that may happen at some point in the future.
+    A custom event that can notify multiple listeners when triggered.
+
+    Use this class to create your own event system within Python code.
+    Listeners can be either regular functions or async functions.
+
+    ```python
+    from pyscript.events import Event
+
+    # Create a custom event.
+    data_loaded = Event()
+
+    # Add a listener.
+    def on_data_loaded(result):
+        print(f"Data loaded: {result}")
+
+    data_loaded.add_listener(on_data_loaded)
+
+    # Time passes.... trigger the event.
+    data_loaded.trigger({"data": 123})
+    ```
     """
 
     def __init__(self):
@@ -19,116 +49,189 @@ class Event:
 
     def trigger(self, result):
         """
-        Trigger the event with a result to pass into the handlers.
+        Trigger the event and notify all listeners with the given `result`.
         """
         for listener in self._listeners:
             if is_awaitable(listener):
-                # Use create task to avoid making this an async function.
                 asyncio.create_task(listener(result))
             else:
                 listener(result)
 
     def add_listener(self, listener):
         """
-        Add a callable/awaitable to listen to when this event is triggered.
-        """
-        if is_awaitable(listener) or callable(listener):
-            if listener not in self._listeners:
-                self._listeners.append(listener)
-        else:
-            msg = "Listener must be callable or awaitable."
-            raise ValueError(msg)
+        Add a function to be called when this event is triggered.
 
-    def remove_listener(self, *args):
+        The `listener` must be callable. It can be either a regular function
+        or an async function. Duplicate listeners are ignored.
         """
-        Clear the specified handler functions in *args. If no handlers
-        provided, clear all handlers.
+        if not callable(listener):
+            msg = "Listener must be callable."
+            raise ValueError(msg)
+        if listener not in self._listeners:
+            self._listeners.append(listener)
+
+    def remove_listener(self, *listeners):
         """
-        if args:
-            for listener in args:
-                self._listeners.remove(listener)
+        Remove specified `listeners`. If none specified, remove all listeners.
+        """
+        if listeners:
+            for listener in listeners:
+                try:
+                    self._listeners.remove(listener)
+                except ValueError:
+                    pass  # Silently ignore listeners not in the list.
         else:
             self._listeners = []
 
 
-def when(target, *args, **kwargs):
+def when(event_type, selector=None, **options):
     """
-    Add an event listener to the target element(s) for the specified event type.
+    A decorator to handle DOM events or custom `Event` objects.
 
-    The target can be a string representing the event type, or an Event object.
-    If the target is an Event object, the event listener will be added to that
-    object. If the target is a string, the event listener will be added to the
-    element(s) that match the (second) selector argument.
+    For DOM events, specify the `event_type` (e.g. `"click"`) and a `selector`
+    for target elements. For custom `Event` objects, just pass the `Event`
+    instance as the `event_type`. It's also possible to pass a list of `Event`
+    objects. The `selector` is required only for DOM events. It should be a
+    [CSS selector string](https://developer.mozilla.org/en-US/docs/Web/CSS/Guides/Selectors),
+    `Element`, `ElementCollection`, or list of DOM elements.
 
-    If a (third) handler argument is provided, it will be called when the event
-    is triggered; thus allowing this to be used as both a function and a
-    decorator.
+    For DOM events only, you can specify optional
+    [addEventListener options](https://developer.mozilla.org/en-US/docs/Web/API/EventTarget/addEventListener#options):
+    `capture`, `once`, `passive`, or `signal`.
+
+    The decorated function can be either a regular function or an async
+    function. If the function accepts an argument, it will receive the event
+    object (for DOM events) or the Event's result (for custom events). A
+    function does not need to accept any arguments if it doesn't require them.
+
+    ```python
+    from pyscript import when, display
+
+    # Handle DOM events.
+    @when("click", "#my-button")
+    def handle_click(event):
+        display("Button clicked!")
+
+    # Handle DOM events with options.
+    @when("click", "#my-button", once=True)
+    def handle_click_once(event):
+        display("Button clicked once!")
+
+    # Handle custom events.
+    my_event = Event()
+
+    @when(my_event)
+    def handle_custom():  # No event argument needed.
+        display("Custom event triggered!")
+
+    # Handle multiple custom events.
+    another_event = Event()
+
+    def another_handler():
+        display("Another custom event handler.")
+
+    # Attach the same handler to multiple events but not as a decorator.
+    when([my_event, another_event])(another_handler)
+
+    # Trigger an Event instance from a DOM event via @when.
+    @when("click", "#my-button")
+    def handle_click(event):
+        another_event.trigger("Button clicked!")
+
+    # Stacked decorators also work.
+    @when("mouseover", "#my-div")
+    @when(my_event)
+    def handle_both(event):
+        display("Either mouseover or custom event triggered!")
+    ```
     """
-    # If "when" is called as a function, try to grab the handler from the
-    # arguments. If there's no handler, this must be a decorator based call.
-    handler = None
-    if args and (callable(args[0]) or is_awaitable(args[0])):
-        handler = args[0]
-    elif callable(kwargs.get("handler")) or is_awaitable(kwargs.get("handler")):
-        handler = kwargs.pop("handler")
-    # If the target is a string, it is the "older" use of `when` where it
-    # represents the name of a DOM event.
-    if isinstance(target, str):
-        # Extract the selector from the arguments or keyword arguments.
-        selector = args[0] if args else kwargs.pop("selector")
+    if isinstance(event_type, str):
+        # This is a DOM event to handle, so check and use the selector.
         if not selector:
-            msg = "No selector provided."
-            raise ValueError(msg)
-        # Grab the DOM elements to which the target event will be attached.
-        from pyscript.web import Element, ElementCollection
-
-        if isinstance(selector, str):
-            elements = document.querySelectorAll(selector)
-        elif isinstance(selector, Element):
-            elements = [selector._dom_element]
-        elif isinstance(selector, ElementCollection):
-            elements = [el._dom_element for el in selector]
-        else:
-            elements = selector if isinstance(selector, list) else [selector]
+            raise ValueError("Selector required for DOM event handling.")
+        elements = _get_elements(selector)
+        if not elements:
+            raise ValueError(f"No elements found for selector: {selector}")
 
     def decorator(func):
-        sig = inspect.signature(func)
-        if sig.parameters:
-            if is_awaitable(func):
-
-                async def wrapper(event):
-                    return await func(event)
-
-            else:
-                wrapper = func
+        wrapper = _create_wrapper(func)
+        if isinstance(event_type, Event):
+            # Custom Event - add listener.
+            event_type.add_listener(wrapper)
+        elif isinstance(event_type, list) and all(
+            isinstance(t, Event) for t in event_type
+        ):
+            # List of custom Events - add listener to each.
+            for event in event_type:
+                event.add_listener(wrapper)
         else:
-            # Function doesn't receive events.
-            if is_awaitable(func):
-
-                async def wrapper(*args, **kwargs):
-                    return await func()
-
-            else:
-
-                def wrapper(*args, **kwargs):
-                    return func()
-
-        wrapper = wraps(func)(wrapper)
-        if isinstance(target, Event):
-            # The target is a single Event object.
-            target.add_listener(wrapper)
-        elif isinstance(target, list) and all(isinstance(t, Event) for t in target):
-            # The target is a list of Event objects.
-            for evt in target:
-                evt.add_listener(wrapper)
-        else:
-            # The target is a string representing an event type, and so a
-            # DOM element or collection of elements is found in "elements".
-            for el in elements:
-                el.addEventListener(target, create_proxy(wrapper))
+            # DOM event - attach to all matched elements.
+            for element in elements:
+                element.addEventListener(
+                    event_type,
+                    create_proxy(wrapper),
+                    to_js(options) if options else False,
+                )
         return wrapper
 
-    # If "when" was called as a decorator, return the decorator function,
-    # otherwise just call the internal decorator function with the supplied
-    # handler.
-    return decorator(handler) if handler else decorator
+    return decorator
+
+
+def _get_elements(selector):
+    """
+    Convert various `selector` types into a list of DOM elements.
+    """
+    from pyscript.web import Element, ElementCollection
+
+    if isinstance(selector, str):
+        return list(document.querySelectorAll(selector))
+    elif isinstance(selector, Element):
+        return [selector._dom_element]
+    elif isinstance(selector, ElementCollection):
+        return [el._dom_element for el in selector]
+    elif isinstance(selector, list):
+        return selector
+    else:
+        return [selector]
+
+
+def _create_wrapper(func):
+    """
+    Create an appropriate wrapper for the given function, `func`.
+
+    The wrapper handles both sync and async functions, and respects whether
+    the function expects to receive event arguments.
+    """
+    # Get the original function if it's been wrapped. This avoids wrapper
+    # loops when stacking decorators.
+    original_func = func
+    while hasattr(original_func, "__wrapped__"):
+        original_func = original_func.__wrapped__
+    # Inspect the original function signature.
+    sig = inspect.signature(original_func)
+    accepts_args = bool(sig.parameters)
+    if is_awaitable(func):
+        if accepts_args:
+
+            async def wrapper(event):
+                return await func(event)
+
+        else:
+
+            async def wrapper(*args, **kwargs):
+                return await func()
+
+    else:
+        if accepts_args:
+            # Always create a new wrapper function to avoid issues with
+            # stacked decorators getting into an infinite loop.
+
+            def wrapper(event):
+                return func(event)
+
+        else:
+
+            def wrapper(*args, **kwargs):
+                return func()
+
+    return wraps(func)(wrapper)
diff --git a/core/src/stdlib/pyscript/fetch.py b/core/src/stdlib/pyscript/fetch.py
index cdcc81c6..77cbf476 100644
--- a/core/src/stdlib/pyscript/fetch.py
+++ b/core/src/stdlib/pyscript/fetch.py
@@ -1,87 +1,218 @@
-import json
+"""
+This module provides a Python-friendly interface to the
+[browser's fetch API](https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API),
+returning native Python data types and supporting directly awaiting the promise
+and chaining method calls directly on the promise.
 
+```python
+from pyscript.fetch import fetch
+url = "https://api.example.com/data"
+
+# Pattern 1: Await the response, then extract data.
+response = await fetch(url)
+if response.ok:
+    data = await response.json()
+else:
+    raise NetworkError(f"Fetch failed: {response.status}")
+
+# Pattern 2: Chain method calls directly on the promise.
+data = await fetch(url).json()
+```
+"""
+
+import json
 import js
 from pyscript.util import as_bytearray
 
 
-### wrap the response to grant Pythonic results
-class _Response:
+class _FetchResponse:
+    """
+    Wraps a JavaScript Response object with Pythonic data extraction methods.
+
+    This wrapper ensures that data returned from fetch is, if possible, in
+    native Python types rather than JavaScript types.
+    """
+
     def __init__(self, response):
         self._response = response
 
-    # grant access to response.ok and other fields
     def __getattr__(self, attr):
+        """
+        Provide access to underlying Response properties like ok, status, etc.
+        """
         return getattr(self._response, attr)
 
-    # exposed methods with Pythonic results
     async def arrayBuffer(self):
+        """
+        Get response body as a buffer (memoryview or bytes).
+
+        Returns a memoryview in MicroPython or bytes in Pyodide, representing
+        the raw binary data.
+        """
         buffer = await self._response.arrayBuffer()
-        # works in Pyodide
         if hasattr(buffer, "to_py"):
+            # Pyodide conversion.
             return buffer.to_py()
-        # shims in MicroPython
+        # MicroPython conversion.
         return memoryview(as_bytearray(buffer))
 
     async def blob(self):
+        """
+        Get response body as a JavaScript Blob object.
+
+        Returns the raw JS Blob for use with other JS APIs.
+        """
         return await self._response.blob()
 
     async def bytearray(self):
+        """
+        Get response body as a Python bytearray.
+
+        Returns a mutable bytearray containing the response data.
+        """
         buffer = await self._response.arrayBuffer()
         return as_bytearray(buffer)
 
     async def json(self):
+        """
+        Parse response body as JSON and return Python objects.
+
+        Returns native Python dicts, lists, strings, numbers, etc.
+        """
         return json.loads(await self.text())
 
     async def text(self):
+        """
+        Get response body as a text string.
+        """
         return await self._response.text()
 
 
-### allow direct await to _Response methods
-class _DirectResponse:
-    @staticmethod
-    def setup(promise, response):
-        promise._response = _Response(response)
-        return promise._response
+class _FetchPromise:
+    """
+    Wraps the fetch promise to enable direct method chaining.
+
+    This allows calling response methods directly on the fetch promise:
+    `await fetch(url).json()` instead of requiring two separate awaits.
+
+    This feels more Pythonic since it matches typical usage patterns
+    Python developers have got used to via libraries like `requests`.
+    """
 
     def __init__(self, promise):
         self._promise = promise
+        # To be resolved in the future via the setup() static method.
         promise._response = None
+        # Add convenience methods directly to the promise.
         promise.arrayBuffer = self.arrayBuffer
         promise.blob = self.blob
         promise.bytearray = self.bytearray
         promise.json = self.json
         promise.text = self.text
 
-    async def _response(self):
+    @staticmethod
+    def setup(promise, response):
+        """
+        Store the resolved response on the promise for later access.
+        """
+        promise._response = _FetchResponse(response)
+        return promise._response
+
+    async def _get_response(self):
+        """
+        Get the cached response, or await the promise if not yet resolved.
+        """
         if not self._promise._response:
             await self._promise
         return self._promise._response
 
     async def arrayBuffer(self):
-        response = await self._response()
+        response = await self._get_response()
         return await response.arrayBuffer()
 
     async def blob(self):
-        response = await self._response()
+        response = await self._get_response()
         return await response.blob()
 
     async def bytearray(self):
-        response = await self._response()
+        response = await self._get_response()
         return await response.bytearray()
 
     async def json(self):
-        response = await self._response()
+        response = await self._get_response()
         return await response.json()
 
     async def text(self):
-        response = await self._response()
+        response = await self._get_response()
         return await response.text()
 
 
-def fetch(url, **kw):
-    # workaround Pyodide / MicroPython dict <-> js conversion
-    options = js.JSON.parse(json.dumps(kw))
-    awaited = lambda response, *args: _DirectResponse.setup(promise, response)
-    promise = js.fetch(url, options).then(awaited)
-    _DirectResponse(promise)
+def fetch(url, **options):
+    """
+    Fetch a resource from the network using a Pythonic interface.
+
+    This wraps JavaScript's fetch API, returning Python-native data types
+    and supporting both direct promise awaiting and method chaining.
+
+    The function takes a `url` and optional fetch `options` as keyword
+    arguments. The `options` correspond to the JavaScript fetch API's
+    [RequestInit dictionary](https://developer.mozilla.org/en-US/docs/Web/API/RequestInit),
+    and commonly include:
+
+    - `method`: HTTP method (e.g., `"GET"`, `"POST"`, `"PUT"` etc.)
+    - `headers`: Dict of request headers.
+    - `body`: Request body (string, dict for JSON, etc.)
+
+    The function returns a promise that resolves to a Response-like object
+    with Pythonic methods to extract data:
+
+    - `await response.json()` to get JSON as Python objects.
+    - `await response.text()` to get text data.
+    - `await response.bytearray()` to get raw data as a bytearray.
+    - `await response.arrayBuffer()` to get raw data as a memoryview or bytes.
+    - `await response.blob()` to get the raw JS Blob object.
+
+    It's also possible to chain these methods directly on the fetch promise:
+    `data = await fetch(url).json()`
+
+    The returned response object also exposes standard properties like
+    `ok`, `status`, and `statusText` for checking response status.
+
+    ```python
+    # Simple GET request.
+    response = await fetch("https://api.example.com/data")
+    data = await response.json()
+
+    # Method chaining.
+    data = await fetch("https://api.example.com/data").json()
+
+    # POST request with JSON.
+    response = await fetch(
+        "https://api.example.com/users",
+        method="POST",
+        headers={"Content-Type": "application/json"},
+        body=json.dumps({"name": "Alice"})
+    )
+    result = await response.json()
+
+    # Check response status codes.
+    response = await fetch("https://api.example.com/data")
+    if response.ok:
+        # Status in the range 200-299.
+        data = await response.json()
+    elif response.status == 404:
+        print("Resource not found")
+    else:
+        print(f"Error: {response.status} {response.statusText}")
+    ```
+    """
+    # Convert Python dict to JavaScript object.
+    js_options = js.JSON.parse(json.dumps(options))
+
+    # Setup response handler to wrap the result.
+    def on_response(response, *_):
+        return _FetchPromise.setup(promise, response)
+
+    promise = js.fetch(url, js_options).then(on_response)
+    _FetchPromise(promise)
     return promise
diff --git a/core/src/stdlib/pyscript/ffi.py b/core/src/stdlib/pyscript/ffi.py
index b3a97d91..30fd77d7 100644
--- a/core/src/stdlib/pyscript/ffi.py
+++ b/core/src/stdlib/pyscript/ffi.py
@@ -1,48 +1,164 @@
+"""
+This module provides a unified
+[Foreign Function Interface (FFI)](https://en.wikipedia.org/wiki/Foreign_function_interface)
+layer for Python/JavaScript interactions, that works consistently across both
+Pyodide and MicroPython, and in a worker or main thread context, abstracting
+away the differences in their JavaScript interop APIs.
+
+The following utilities work on both the main thread and in worker contexts:
+
+- `create_proxy`: Create a persistent JavaScript proxy of a Python function.
+- `to_js`: Convert Python objects to JavaScript objects.
+- `is_none`: Check if a value is Python `None` or JavaScript `null`.
+- `assign`: Merge objects (like JavaScript's `Object.assign`).
+
+The following utilities are specific to worker contexts:
+
+- `direct`: Mark objects for direct JavaScript access.
+- `gather`: Collect multiple values from worker contexts.
+- `query`: Query objects in worker contexts.
+
+More details of the `direct`, `gather`, and `query` utilities
+[can be found here](https://github.com/WebReflection/reflected-ffi?tab=readme-ov-file#remote-extra-utilities).
+"""
+
 try:
+    # Attempt to import Pyodide's FFI utilities.
     import js
     from pyodide.ffi import create_proxy as _cp
     from pyodide.ffi import to_js as _py_tjs
     from pyodide.ffi import jsnull
 
     from_entries = js.Object.fromEntries
-    is_none = lambda value: value is None or value is jsnull
 
-    def _tjs(value, **kw):
-        if not hasattr(kw, "dict_converter"):
+    def _to_js_wrapper(value, **kw):
+        if "dict_converter" not in kw:
             kw["dict_converter"] = from_entries
         return _py_tjs(value, **kw)
 
 except:
+    # Fallback to jsffi for MicroPython.
     from jsffi import create_proxy as _cp
-    from jsffi import to_js as _tjs
+    from jsffi import to_js as _to_js_wrapper
     import js
 
     jsnull = js.Object.getPrototypeOf(js.Object.prototype)
-    is_none = lambda value: value is None or value is jsnull
 
-create_proxy = _cp
-to_js = _tjs
+
+def create_proxy(func):
+    """
+    Create a persistent JavaScript proxy of a Python function.
+
+    This proxy allows JavaScript code to call the Python function
+    seamlessly, maintaining the correct context and argument handling.
+
+    This is especially useful when passing Python functions as callbacks
+    to JavaScript APIs (without `create_proxy`, the function would be
+    garbage collected after the declaration of the callback).
+
+    ```python
+    from pyscript import ffi
+    from pyscript import document
+
+    my_button = document.getElementById("my-button")
+
+    def py_callback(x):
+        print(f"Callback called with {x}")
+
+    my_button.addEventListener("click", ffi.create_proxy(py_callback))
+    ```
+    """
+    return _cp(func)
+
+
+def to_js(value, **kw):
+    """
+    Convert Python objects to JavaScript objects.
+
+    This ensures a Python `dict` becomes a
+    [proper JavaScript object](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object)
+    rather a JavaScript [`Map`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Map),
+    which is more intuitive for most use cases.
+
+    Where required, the underlying `to_js` uses `Object.fromEntries` for
+    `dict` conversion.
+
+    ```python
+    from pyscript import ffi
+    import js
+
+
+    note = {
+        "body": "This is a notification",
+        "icon": "icon.png"
+    }
+
+    js.Notification.new("Hello!", ffi.to_js(note))
+    ```
+    """
+    return _to_js_wrapper(value, **kw)
+
+
+def is_none(value):
+    """
+    Check if a value is `None` or JavaScript `null`.
+
+    In Pyodide, JavaScript `null` is represented by the `jsnull` object,
+    so we check for both Python `None` and `jsnull`. This function ensures
+    consistent behavior across Pyodide and MicroPython for null-like
+    values.
+
+    ```python
+    from pyscript import ffi
+    import js
+
+
+    val1 = None
+    val2 = js.null
+    val3 = 42
+
+    print(ffi.is_none(val1))  # True
+    print(ffi.is_none(val2))  # True
+    print(ffi.is_none(val3))  # False
+    ```
+    """
+    return value is None or value is jsnull
+
 
 try:
+    # Worker context utilities from reflected-ffi.
+    # See https://github.com/WebReflection/reflected-ffi for more details.
     from polyscript import ffi as _ffi
 
+    _assign = _ffi.assign
+
     direct = _ffi.direct
     gather = _ffi.gather
     query = _ffi.query
 
-    def assign(source, *args):
-        for arg in args:
-            _ffi.assign(source, to_js(arg))
-        return source
-
 except:
+    # Fallback implementations for main thread context.
     import js
 
     _assign = js.Object.assign
 
     direct = lambda source: source
 
-    def assign(source, *args):
-        for arg in args:
-            _assign(source, to_js(arg))
-        return source
+
+def assign(source, *args):
+    """
+    Merge JavaScript objects (like
+    [Object.assign](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/assign)).
+
+    Takes a target object and merges properties from one or more source
+    objects into it, returning the modified target.
+
+    ```python
+    obj = js.Object.new()
+    ffi.assign(obj, {"a": 1}, {"b": 2})
+    # obj now has properties a=1 and b=2
+    ```
+    """
+    for arg in args:
+        _assign(source, to_js(arg))
+    return source
diff --git a/core/src/stdlib/pyscript/flatted.py b/core/src/stdlib/pyscript/flatted.py
index f34bc281..a49568e9 100644
--- a/core/src/stdlib/pyscript/flatted.py
+++ b/core/src/stdlib/pyscript/flatted.py
@@ -1,4 +1,36 @@
-# https://www.npmjs.com/package/flatted
+"""
+This module is a Python implementation of the
+[Flatted JavaScript library](https://www.npmjs.com/package/flatted), which
+provides a light and fast way to serialize and deserialize JSON structures
+that contain circular references.
+
+Standard JSON cannot handle circular references - attempting to serialize an
+object that references itself will cause an error. Flatted solves this by
+transforming circular structures into a flat array format that can be safely
+serialized and later reconstructed.
+
+Common use cases:
+
+- Serializing complex object graphs with circular references.
+- Working with DOM-like structures that contain parent/child references.
+- Preserving object identity when serializing data structures.
+
+```python
+from pyscript import flatted
+
+
+# Create a circular structure.
+obj = {"name": "parent"}
+obj["self"] = obj  # Circular reference!
+
+# Standard json.dumps would fail here.
+serialized = flatted.stringify(obj)
+
+# Reconstruct the original structure.
+restored = flatted.parse(serialized)
+assert restored["self"] is restored  # Circular reference preserved!
+```
+"""
 
 import json as _json
 
@@ -114,6 +146,26 @@ def _wrap(value):
 
 
 def parse(value, *args, **kwargs):
+    """
+    Parse a Flatted JSON string and reconstruct the original structure.
+
+    This function takes a `value` containing a JSON string created by
+    Flatted's stringify() and reconstructs the original Python object,
+    including any circular references. The `*args` and `**kwargs` are passed
+    to json.loads() for additional customization.
+
+    ```python
+    from pyscript import flatted
+
+
+    # Parse a Flatted JSON string.
+    json_string = '[{"name": "1", "self": "0"}, "parent"]'
+    obj = flatted.parse(json_string)
+
+    # Circular references are preserved.
+    assert obj["self"] is obj
+    ```
+    """
     json = _json.loads(value, *args, **kwargs)
     wrapped = []
     for value in json:
@@ -138,6 +190,31 @@ def parse(value, *args, **kwargs):
 
 
 def stringify(value, *args, **kwargs):
+    """
+    Serialize a Python object to a Flatted JSON string.
+
+    This function converts `value`, a Python object (including those with
+    circular references), into a JSON string that can be safely transmitted
+    or stored. The resulting string can be reconstructed using Flatted's
+    parse(). The `*args` and `**kwargs` are passed to json.dumps() for
+    additional customization.
+
+    ```python
+    from pyscript import flatted
+
+
+    # Create an object with a circular reference.
+    parent = {"name": "parent", "children": []}
+    child = {"name": "child", "parent": parent}
+    parent["children"].append(child)
+
+    # Serialize it (standard json.dumps would fail here).
+    json_string = flatted.stringify(parent)
+
+    # Can optionally pretty-print via JSON indentation etc.
+    pretty = flatted.stringify(parent, indent=2)
+    ```
+    """
     known = _Known()
     input = []
     output = []
diff --git a/core/src/stdlib/pyscript/fs.py b/core/src/stdlib/pyscript/fs.py
index dca75db8..c6c87c42 100644
--- a/core/src/stdlib/pyscript/fs.py
+++ b/core/src/stdlib/pyscript/fs.py
@@ -1,7 +1,63 @@
+"""
+This module provides an API for mounting directories from the user's local
+filesystem into the browser's virtual filesystem. This means Python code,
+running in the browser, can read and write files on the user's local machine.
+
+!!! warning
+    **This API only works in Chromium-based browsers** (Chrome, Edge,
+    Vivaldi, Brave, etc.) that support the
+    [File System Access API](https://wicg.github.io/file-system-access/).
+
+The module maintains a `mounted` dictionary that tracks all currently mounted
+paths and their associated filesystem handles.
+
+```python
+from pyscript import fs, document, when
+
+
+# Mount a local directory to the `/local` mount point in the browser's
+# virtual filesystem (may prompt user for permission).
+await fs.mount("/local")
+
+# Alternatively, mount on a button click event. This is important because
+# if the call to `fs.mount` happens after a click or other transient event,
+# the confirmation dialog will not be shown.
+@when("click", "#mount-button")
+async def handler(event):
+    await fs.mount("/another_dir")
+
+# Work with files in the mounted directory as usual.
+with open("/local/example.txt", "w") as f:
+    f.write("Hello from PyScript!")
+
+# Ensure changes are written to local filesystem.
+await fs.sync("/local")
+
+# Clean up when done.
+await fs.unmount("/local")
+```
+"""
+
+import js
+from _pyscript import fs as _fs, interpreter
+from pyscript import window
+from pyscript.ffi import to_js
+from pyscript.context import RUNNING_IN_WORKER
+
+# Worker-specific imports.
+if RUNNING_IN_WORKER:
+    from pyscript.context import sync as sync_with_worker
+    from polyscript import IDBMap
+
 mounted = {}
+"""Global dictionary tracking mounted paths and their filesystem handles."""
 
 
-async def get_handler(details):
+async def _check_permission(details):
+    """
+    Check if permission has been granted for a filesystem handler. Returns
+    the handler if permission is granted, otherwise None.
+    """
     handler = details.handler
     options = details.options
     permission = await handler.queryPermission(options)
@@ -9,94 +65,194 @@ async def get_handler(details):
 
 
 async def mount(path, mode="readwrite", root="", id="pyscript"):
-    import js
-    from _pyscript import fs, interpreter
-    from pyscript.ffi import to_js
-    from pyscript.magic_js import (
-        RUNNING_IN_WORKER,
-        sync,
-    )
+    """
+    Mount a directory from the local filesystem to the virtual filesystem
+    at the specified `path` mount point. The `mode` can be "readwrite" or
+    "read" to specify access level. The `root` parameter provides a hint
+    for the file picker starting location. The `id` parameter allows multiple
+    distinct mounts at the same path.
 
+    On first use, the browser will prompt the user to select a directory
+    and grant permission.
+
+    ```python
+    from pyscript import fs
+
+
+    # Basic mount with default settings.
+    await fs.mount("/local")
+
+    # Mount with read-only access.
+    await fs.mount("/readonly", mode="read")
+
+    # Mount with a hint to start in Downloads folder.
+    await fs.mount("/downloads", root="downloads")
+
+    # Mount with a custom ID to track different directories.
+    await fs.mount("/project", id="my-project")
+    ```
+
+    If called during a user interaction (like a button click), the
+    permission dialog may be skipped if permission was previously granted.
+    """
     js.console.warn("experimental pyscript.fs ⚠️")
 
+    # Check if path is already mounted with a different ID.
+    mount_key = f"{path}@{id}"
+    if path in mounted:
+        # Path already mounted - check if it's the same ID.
+        for existing_key in mounted.keys():
+            if existing_key.startswith(f"{path}@") and existing_key != mount_key:
+                raise ValueError(
+                    f"Path '{path}' is already mounted with a different ID. "
+                    f"Unmount it first or use a different path."
+                )
+
     details = None
     handler = None
 
-    uid = f"{path}@{id}"
-
     options = {"id": id, "mode": mode}
     if root != "":
         options["startIn"] = root
 
     if RUNNING_IN_WORKER:
-        fsh = sync.storeFSHandler(uid, to_js(options))
+        fs_handler = sync_with_worker.storeFSHandler(mount_key, to_js(options))
 
-        # allow both async and/or SharedArrayBuffer use case
-        if isinstance(fsh, bool):
-            success = fsh
+        # Handle both async and SharedArrayBuffer use cases.
+        if isinstance(fs_handler, bool):
+            success = fs_handler
         else:
-            success = await fsh
+            success = await fs_handler
 
         if success:
-            from polyscript import IDBMap
-            from pyscript import window
-
-            idbm = IDBMap.new(fs.NAMESPACE)
-            details = await idbm.get(uid)
-            handler = await get_handler(details)
+            idbm = IDBMap.new(_fs.NAMESPACE)
+            details = await idbm.get(mount_key)
+            handler = await _check_permission(details)
             if handler is None:
-                # force await in either async or sync scenario
-                await js.Promise.resolve(sync.getFSHandler(details.options))
+                # Force await in either async or sync scenario.
+                await js.Promise.resolve(sync_with_worker.getFSHandler(details.options))
                 handler = details.handler
-
         else:
-            raise RuntimeError(fs.ERROR)
+            raise RuntimeError(_fs.ERROR)
 
     else:
-        success = await fs.idb.has(uid)
+        success = await _fs.idb.has(mount_key)
 
         if success:
-            details = await fs.idb.get(uid)
-            handler = await get_handler(details)
+            details = await _fs.idb.get(mount_key)
+            handler = await _check_permission(details)
             if handler is None:
-                handler = await fs.getFileSystemDirectoryHandle(details.options)
+                handler = await _fs.getFileSystemDirectoryHandle(details.options)
         else:
             js_options = to_js(options)
-            handler = await fs.getFileSystemDirectoryHandle(js_options)
+            handler = await _fs.getFileSystemDirectoryHandle(js_options)
             details = {"handler": handler, "options": js_options}
-            await fs.idb.set(uid, to_js(details))
+            await _fs.idb.set(mount_key, to_js(details))
 
     mounted[path] = await interpreter.mountNativeFS(path, handler)
 
 
-async def revoke(path, id="pyscript"):
-    from _pyscript import fs, interpreter
-    from pyscript.magic_js import (
-        RUNNING_IN_WORKER,
-        sync,
-    )
-
-    uid = f"{path}@{id}"
-
-    if RUNNING_IN_WORKER:
-        had = sync.deleteFSHandler(uid)
-    else:
-        had = await fs.idb.has(uid)
-        if had:
-            had = await fs.idb.delete(uid)
-
-    if had:
-        interpreter._module.FS.unmount(path)
-
-    return had
-
-
 async def sync(path):
+    """
+    Synchronise the virtual and local filesystems for a mounted `path`.
+
+    This ensures all changes made in the browser's virtual filesystem are
+    written to the user's local filesystem, and vice versa.
+
+    ```python
+    from pyscript import fs
+
+
+    await fs.mount("/local")
+
+    # Make changes to files.
+    with open("/local/data.txt", "w") as f:
+        f.write("Important data")
+
+    # Ensure changes are written to local disk.
+    await fs.sync("/local")
+    ```
+
+    This is automatically called by unmount(), but you may want to call
+    it explicitly to ensure data persistence at specific points.
+    """
+    if path not in mounted:
+        raise KeyError(
+            f"Path '{path}' is not mounted. " f"Use fs.mount() to mount it first."
+        )
     await mounted[path].syncfs()
 
 
 async def unmount(path):
-    from _pyscript import interpreter
+    """
+    Unmount a directory, specified by `path`, from the virtual filesystem.
+
+    This synchronises any pending changes and then removes the mount point,
+    freeing up memory. The `path` can be reused for mounting a different
+    directory.
+
+    ```python
+    from pyscript import fs
+
+
+    await fs.mount("/local")
+    # ... work with files ...
+    await fs.unmount("/local")
+
+    # Path can now be reused.
+    await fs.mount("/local", id="different-folder")
+    ```
+
+    This automatically calls `sync()` before unmounting to ensure no data
+    is lost.
+    """
+    if path not in mounted:
+        raise KeyError(f"Path '{path}' is not mounted. Cannot unmount.")
 
     await sync(path)
     interpreter._module.FS.unmount(path)
+    del mounted[path]
+
+
+async def revoke(path, id="pyscript"):
+    """
+    Revoke filesystem access permission and unmount for a given
+    `path` and `id` combination.
+
+    This removes the stored permission for accessing the user's local
+    filesystem at the specified path and ID. Unlike `unmount()`, which only
+    removes the mount point, `revoke()` also clears the permission so the
+    user will be prompted again on next mount.
+
+    ```python
+    from pyscript import fs
+
+
+    await fs.mount("/local", id="my-app")
+    # ... work with files ...
+
+    # Revoke permission (user will be prompted again next time).
+    revoked = await fs.revoke("/local", id="my-app")
+
+    if revoked:
+        print("Permission revoked successfully")
+    ```
+
+    After revoking, the user will need to grant permission again and
+    select a directory when `mount()` is called next time.
+    """
+    mount_key = f"{path}@{id}"
+
+    if RUNNING_IN_WORKER:
+        handler_exists = sync_with_worker.deleteFSHandler(mount_key)
+    else:
+        handler_exists = await _fs.idb.has(mount_key)
+        if handler_exists:
+            handler_exists = await _fs.idb.delete(mount_key)
+
+    if handler_exists:
+        interpreter._module.FS.unmount(path)
+        if path in mounted:
+            del mounted[path]
+
+    return handler_exists
diff --git a/core/src/stdlib/pyscript/magic_js.py b/core/src/stdlib/pyscript/magic_js.py
deleted file mode 100644
index 34c988c9..00000000
--- a/core/src/stdlib/pyscript/magic_js.py
+++ /dev/null
@@ -1,87 +0,0 @@
-import json
-import sys
-
-import js as globalThis
-from polyscript import config as _config
-from polyscript import js_modules
-from pyscript.util import NotSupported
-
-RUNNING_IN_WORKER = not hasattr(globalThis, "document")
-
-config = json.loads(globalThis.JSON.stringify(_config))
-
-if isinstance(config, str):
-    config = {}
-
-if "MicroPython" in sys.version:
-    config["type"] = "mpy"
-else:
-    config["type"] = "py"
-
-
-# allow `from pyscript.js_modules.xxx import yyy`
-class JSModule:
-    def __init__(self, name):
-        self.name = name
-
-    def __getattr__(self, field):
-        # avoid pyodide looking for non existent fields
-        if not field.startswith("_"):
-            return getattr(getattr(js_modules, self.name), field)
-        return None
-
-
-# generate N modules in the system that will proxy the real value
-for name in globalThis.Reflect.ownKeys(js_modules):
-    sys.modules[f"pyscript.js_modules.{name}"] = JSModule(name)
-sys.modules["pyscript.js_modules"] = js_modules
-
-if RUNNING_IN_WORKER:
-    import polyscript
-
-    PyWorker = NotSupported(
-        "pyscript.PyWorker",
-        "pyscript.PyWorker works only when running in the main thread",
-    )
-
-    try:
-        import js
-
-        window = polyscript.xworker.window
-        document = window.document
-        js.document = document
-        # this is the same as js_import on main and it lands modules on main
-        js_import = window.Function(
-            "return (...urls) => Promise.all(urls.map((url) => import(url)))"
-        )()
-    except:
-        message = "Unable to use `window` or `document` -> https://docs.pyscript.net/latest/faq/#sharedarraybuffer"
-        globalThis.console.warn(message)
-        window = NotSupported("pyscript.window", message)
-        document = NotSupported("pyscript.document", message)
-        js_import = None
-
-    sync = polyscript.xworker.sync
-
-    # in workers the display does not have a default ID
-    # but there is a sync utility from xworker
-    def current_target():
-        return polyscript.target
-
-else:
-    import _pyscript
-    from _pyscript import PyWorker as _PyWorker, js_import
-    from pyscript.ffi import to_js
-
-    def PyWorker(url, **kw):
-        return _PyWorker(url, to_js(kw))
-
-    window = globalThis
-    document = globalThis.document
-    sync = NotSupported(
-        "pyscript.sync", "pyscript.sync works only when running in a worker"
-    )
-
-    # in MAIN the current element target exist, just use it
-    def current_target():
-        return _pyscript.target
diff --git a/core/src/stdlib/pyscript/media.py b/core/src/stdlib/pyscript/media.py
index e6ed5c18..e60a9bce 100644
--- a/core/src/stdlib/pyscript/media.py
+++ b/core/src/stdlib/pyscript/media.py
@@ -1,87 +1,247 @@
+"""
+This module provides classes and functions for interacting with
+[media devices and streams](https://developer.mozilla.org/en-US/docs/Web/API/Media_Capture_and_Streams_API)
+in the browser, enabling you to work with cameras, microphones,
+and other media input/output devices directly from Python.
+
+Use this module for:
+
+- Accessing webcams for video capture.
+- Recording audio from microphones.
+- Enumerating available media devices.
+- Applying constraints to media streams (resolution, frame rate, etc.).
+
+```python
+from pyscript import document
+from pyscript.media import Device, list_devices
+
+
+# Get a video stream from the default camera.
+stream = await Device.request_stream(video=True)
+
+# Display in a video element.
+video = document.getElementById("my-video")
+video.srcObject = stream
+
+# Or list all available devices.
+devices = await list_devices()
+for device in devices:
+    print(f"{device.kind}: {device.label}")
+```
+
+Using media devices requires user permission. Browsers will show a
+permission dialog when accessing devices for the first time.
+"""
+
 from pyscript import window
 from pyscript.ffi import to_js
 
 
 class Device:
-    """Device represents a media input or output device, such as a microphone,
-    camera, or headset.
+    """
+    Represents a media input or output device.
+
+    This class wraps a browser
+    [MediaDeviceInfo object](https://developer.mozilla.org/en-US/docs/Web/API/MediaDeviceInfo),
+    providing Pythonic access to device properties like `ID`, `label`, and
+    `kind` (audio/video, input/output).
+
+    Devices are typically obtained via the `list_devices()` function in this
+    module, rather than constructed directly.
+
+    ```python
+    from pyscript.media import list_devices
+
+
+    # Get all available devices.
+    devices = await list_devices()
+
+    # Find video input devices (cameras).
+    cameras = [d for d in devices if d.kind == "videoinput"]
+
+    # Get a stream from a specific camera.
+    if cameras:
+        stream = await cameras[0].get_stream()
+    ```
     """
 
     def __init__(self, device):
-        self._dom_element = device
+        """
+        Create a Device wrapper around a MediaDeviceInfo `device`.
+        """
+        self._device_info = device
 
     @property
     def id(self):
-        return self._dom_element.deviceId
+        """
+        Unique identifier for this device.
+
+        This `ID` persists across sessions but is reset when the user clears
+        cookies. It's unique to the origin of the calling application.
+        """
+        return self._device_info.deviceId
 
     @property
     def group(self):
-        return self._dom_element.groupId
+        """
+        Group identifier for related devices.
+
+        Devices belonging to the same physical device (e.g., a monitor with
+        both a camera and microphone) share the same `group ID`.
+        """
+        return self._device_info.groupId
 
     @property
     def kind(self):
-        return self._dom_element.kind
+        """
+        Device type: `"videoinput"`, `"audioinput"`, or `"audiooutput"`.
+        """
+        return self._device_info.kind
 
     @property
     def label(self):
-        return self._dom_element.label
+        """
+        Human-readable description of the device.
+
+        Example: `"External USB Webcam"` or `"Built-in Microphone"`.
+        """
+        return self._device_info.label
 
     def __getitem__(self, key):
+        """
+        Support bracket notation for JavaScript interop.
+
+        Allows accessing properties via `device["id"]` syntax. Necessary
+        when Device instances are proxied to JavaScript.
+        """
         return getattr(self, key)
 
+    @classmethod
+    async def request_stream(cls, audio=False, video=True):
+        """
+        Request a media stream with the specified constraints.
+
+        This is a class method that requests access to media devices matching
+        the given `audio` and `video` constraints. The browser will prompt the
+        user for permission if needed and return a `MediaStream` object that
+        can be assigned to video/audio elements.
+
+        Simple boolean constraints for `audio` and `video` can be used to
+        request default devices. More complex constraints can be specified as
+        dictionaries conforming to
+        [the MediaTrackConstraints interface](https://developer.mozilla.org/en-US/docs/Web/API/MediaTrackConstraints).
+
+        ```python
+        from pyscript import document
+        from pyscript.media import Device
+
+
+        # Get default video stream.
+        stream = await Device.request_stream()
+
+        # Get stream with specific constraints.
+        stream = await Device.request_stream(
+            video={"width": 1920, "height": 1080}
+        )
+
+        # Get audio and video.
+        stream = await Device.request_stream(audio=True, video=True)
+
+        # Use the stream.
+        video_el = document.getElementById("camera")
+        video_el.srcObject = stream
+        ```
+
+        This method will trigger a browser permission dialog on first use.
+        """
+        options = {}
+        if isinstance(audio, bool):
+            options["audio"] = audio
+        elif isinstance(audio, dict):
+            # audio is a dict of constraints (sampleRate, echoCancellation etc...).
+            options["audio"] = audio
+        if isinstance(video, bool):
+            options["video"] = video
+        elif isinstance(video, dict):
+            # video is a dict of constraints (width, height etc...).
+            options["video"] = video
+        return await window.navigator.mediaDevices.getUserMedia(to_js(options))
+
     @classmethod
     async def load(cls, audio=False, video=True):
         """
-        Load the device stream.
+        !!! warning
+            **Deprecated: Use `request_stream()` instead.**
+
+            This method is retained for backwards compatibility but will be
+            removed in a future release. Please use `request_stream()` instead.
         """
-        options = {}
-        options["audio"] = audio
-        if isinstance(video, bool):
-            options["video"] = video
-        else:
-            options["video"] = {}
-            for k in video:
-                options["video"][k] = video[k]
-        return await window.navigator.mediaDevices.getUserMedia(to_js(options))
+        return await cls.request_stream(audio=audio, video=video)
 
     async def get_stream(self):
-        key = self.kind.replace("input", "").replace("output", "")
-        options = {key: {"deviceId": {"exact": self.id}}}
-        return await self.load(**options)
+        """
+        Get a media stream from this specific device.
+
+        ```python
+        from pyscript.media import list_devices
 
 
-async def list_devices() -> list[dict]:
+        # List all devices.
+        devices = await list_devices()
+
+        # Find a specific camera.
+        my_camera = None
+        for device in devices:
+            if device.kind == "videoinput" and "USB" in device.label:
+                my_camera = device
+                break
+
+        # Get a stream from that specific camera.
+        if my_camera:
+            stream = await my_camera.get_stream()
+        ```
+
+        This will trigger a permission dialog if the user hasn't already
+        granted permission for this device type.
+        """
+        # Extract media type from device kind (e.g., "videoinput" -> "video").
+        media_type = self.kind.replace("input", "").replace("output", "")
+        # Request stream with exact device ID constraint.
+        options = {media_type: {"deviceId": {"exact": self.id}}}
+        return await self.request_stream(**options)
+
+
+async def list_devices():
     """
-    Return the list of the currently available media input and output devices,
-    such as microphones, cameras, headsets, and so forth.
+    Returns a list of all media devices currently available to the browser,
+    such as microphones, cameras, and speakers.
 
-    Output:
+    ```python
+    from pyscript.media import list_devices
 
-        list(dict) - list of dictionaries representing the available media devices.
-            Each dictionary has the following keys:
-            * deviceId: a string that is an identifier for the represented device
-                that is persisted across sessions. It is un-guessable by other
-                applications and unique to the origin of the calling application.
-                It is reset when the user clears cookies (for Private Browsing, a
-                different identifier is used that is not persisted across sessions).
 
-            * groupId: a string that is a group identifier. Two devices have the same
-                group identifier if they belong to the same physical device — for
-                example a monitor with both a built-in camera and a microphone.
+    # Get all devices.
+    devices = await list_devices()
 
-            * kind: an enumerated value that is either "videoinput", "audioinput"
-                or "audiooutput".
+    # Print device information.
+    for device in devices:
+        print(f"{device.kind}: {device.label} (ID: {device.id})")
 
-            * label: a string describing this device (for example "External USB
-                Webcam").
+    # Filter for specific device types.
+    cameras = [d for d in devices if d.kind == "videoinput"]
+    microphones = [d for d in devices if d.kind == "audioinput"]
+    speakers = [d for d in devices if d.kind == "audiooutput"]
+    ```
 
-    Note: the returned list will omit any devices that are blocked by the document
-    Permission Policy: microphone, camera, speaker-selection (for output devices),
-    and so on. Access to particular non-default devices is also gated by the
-    Permissions API, and the list will omit devices for which the user has not
-    granted explicit permission.
+    The returned list will omit devices that are blocked by the document
+    [Permission Policy](https://developer.mozilla.org/en-US/docs/Web/HTTP/Guides/Permissions_Policy)
+    (microphone, camera, speaker-selection) or for
+    which the user has not granted explicit permission.
+
+    For security and privacy, device labels may be empty strings until
+    permission is granted. See
+    [this document](https://developer.mozilla.org/en-US/docs/Web/API/MediaDevices/enumerateDevices)
+    for more information about this web standard.
     """
-    # https://developer.mozilla.org/en-US/docs/Web/API/MediaDevices/enumerateDevices
-    return [
-        Device(obj) for obj in await window.navigator.mediaDevices.enumerateDevices()
-    ]
+    device_infos = await window.navigator.mediaDevices.enumerateDevices()
+    return [Device(device_info) for device_info in device_infos]
diff --git a/core/src/stdlib/pyscript/storage.py b/core/src/stdlib/pyscript/storage.py
index 7600d602..50640a9b 100644
--- a/core/src/stdlib/pyscript/storage.py
+++ b/core/src/stdlib/pyscript/storage.py
@@ -1,11 +1,69 @@
-from polyscript import storage as _storage
+"""
+This module wraps the browser's
+[IndexedDB persistent storage](https://developer.mozilla.org/en-US/docs/Web/API/IndexedDB_API)
+to provide a familiar Python dictionary API. Data is automatically
+serialized and persisted, surviving page reloads and browser restarts.
+
+Storage is persistent per origin (domain), isolated between different sites
+for security. Browsers typically allow each origin to store up to 10-60% of
+total disk space, depending on browser and configuration.
+
+What this module provides:
+
+- A `dict`-like API (get, set, delete, iterate).
+- Automatic serialization of common Python types.
+- Background persistence with optional explicit `sync()`.
+- Support for custom `Storage` subclasses.
+
+```python
+from pyscript import storage
+
+
+# Create or open a named storage.
+my_data = await storage("user-preferences")
+
+# Use like a regular dictionary.
+my_data["theme"] = "dark"
+my_data["font_size"] = 14
+my_data["settings"] = {"notifications": True, "sound": False}
+
+# Changes are queued automatically.
+# To ensure immediate write, sync explicitly.
+await my_data.sync()
+
+# Read values (survives page reload).
+theme = my_data.get("theme", "light")
+```
+
+Common types are automatically serialized: `bool`, `int`, `float`, `str`, `None`,
+`list`, `dict`, `tuple`. Binary data (`bytearray`, `memoryview`) can be stored as
+single values but not nested in structures.
+
+Tuples are deserialized as lists due to IndexedDB limitations.
+
+!!! info
+    Browsers typically allow 10-60% of total disk space per origin. Chrome
+    and Edge allow up to 60%, Firefox up to 10 GiB (or 10% of disk, whichever
+    is smaller). Safari varies by app type. These limits are unlikely to be
+    reached in typical usage.
+"""
+
+from polyscript import storage as _polyscript_storage
 from pyscript.flatted import parse as _parse
 from pyscript.flatted import stringify as _stringify
 from pyscript.ffi import is_none
 
 
-# convert a Python value into an IndexedDB compatible entry
-def _to_idb(value):
+def _convert_to_idb(value):
+    """
+    Convert a Python `value` to an IndexedDB-compatible format.
+
+    Values are serialized using Flatted (for circular reference support)
+    with type information to enable proper deserialization. It returns a
+    JSON string representing the serialized value.
+
+    Will raise a TypeError if the value type is not supported.
+    """
     if is_none(value):
         return _stringify(["null", 0])
     if isinstance(value, (bool, float, int, str, list, dict, tuple)):
@@ -14,50 +72,179 @@ def _to_idb(value):
         return _stringify(["bytearray", list(value)])
     if isinstance(value, memoryview):
         return _stringify(["memoryview", list(value)])
-    msg = f"Unexpected value: {value}"
-    raise TypeError(msg)
+    raise TypeError(f"Cannot serialize type {type(value).__name__} for storage.")
 
 
-# convert an IndexedDB compatible entry into a Python value
-def _from_idb(value):
-    (
-        kind,
-        result,
-    ) = _parse(value)
+def _convert_from_idb(value):
+    """
+    Convert an IndexedDB `value` back to its Python representation.
+
+    Uses type information stored during serialization to reconstruct the
+    original Python type.
+    """
+    kind, data = _parse(value)
+
     if kind == "null":
         return None
     if kind == "generic":
-        return result
+        return data
     if kind == "bytearray":
-        return bytearray(result)
+        return bytearray(data)
     if kind == "memoryview":
-        return memoryview(bytearray(result))
+        return memoryview(bytearray(data))
+    # Fallback for all other types.
     return value
 
 
 class Storage(dict):
+    """
+    A persistent dictionary backed by the browser's IndexedDB.
+
+    This class provides a dict-like interface with automatic persistence.
+    Changes are queued for background writing, with optional explicit
+    synchronization via `sync()`.
+
+    Inherits from `dict`, so all standard dictionary methods work as expected.
+
+    ```python
+    from pyscript import storage
+
+
+    # Open a storage.
+    prefs = await storage("preferences")
+
+    # Use as a dictionary.
+    prefs["color"] = "blue"
+    prefs["count"] = 42
+
+    # Iterate like a dict.
+    for key, value in prefs.items():
+        print(f"{key}: {value}")
+
+    # Ensure writes complete immediately.
+    await prefs.sync()
+    ```
+
+    Sometimes you may need to subclass `Storage` to add custom behavior:
+
+    ```python
+    from pyscript import storage, Storage, window
+
+
+    class LoggingStorage(Storage):
+        def __setitem__(self, key, value):
+            window.console.log(f"Setting {key} = {value}")
+            super().__setitem__(key, value)
+
+    my_store = await storage("app-data", storage_class=LoggingStorage)
+    my_store["test"] = 123  # Logs to console.
+    ```
+    """
+
     def __init__(self, store):
-        super().__init__({k: _from_idb(v) for k, v in store.entries()})
-        self.__store__ = store
+        """
+        Create a Storage instance wrapping an IndexedDB `store` (a JS
+        proxy).
+        """
+        super().__init__(
+            {key: _convert_from_idb(value) for key, value in store.entries()}
+        )
+        self._store = store
 
-    def __delitem__(self, attr):
-        self.__store__.delete(attr)
-        super().__delitem__(attr)
+    def __delitem__(self, key):
+        """
+        Delete an item from storage via its `key`.
 
-    def __setitem__(self, attr, value):
-        self.__store__.set(attr, _to_idb(value))
-        super().__setitem__(attr, value)
+        The deletion is queued for persistence. Use `sync()` to ensure
+        immediate completion.
+        """
+        self._store.delete(key)
+        super().__delitem__(key)
+
+    def __setitem__(self, key, value):
+        """
+        Set a `key` to a `value` in storage.
+
+        The change is queued for persistence. Use `sync()` to ensure
+        immediate completion. The `value` must be a supported type for
+        serialization.
+        """
+        self._store.set(key, _convert_to_idb(value))
+        super().__setitem__(key, value)
 
     def clear(self):
-        self.__store__.clear()
+        """
+        Remove all items from storage.
+
+        The `clear()` operation is queued for persistence. Use `sync()` to ensure
+        immediate completion.
+        """
+        self._store.clear()
         super().clear()
 
     async def sync(self):
-        await self.__store__.sync()
+        """
+        Force immediate synchronization to IndexedDB.
+
+        By default, storage operations are queued and written asynchronously.
+        Call `sync()` when you need to guarantee changes are persisted immediately,
+        such as before critical operations or page unload.
+
+        ```python
+        store = await storage("important-data")
+        store["critical_value"] = data
+
+        # Ensure it's written before proceeding.
+        await store.sync()
+        ```
+
+        This is a blocking operation that waits for IndexedDB to complete
+        the write.
+        """
+        await self._store.sync()
 
 
 async def storage(name="", storage_class=Storage):
+    """
+    Open or create persistent storage with a unique `name` and optional
+    `storage_class` (used to extend the default `Storage` based behavior).
+
+    Each storage is isolated by name within the current origin (domain).
+    If the storage doesn't exist, it will be created. If it does exist,
+    its current contents will be loaded.
+
+    This function returns a `Storage` instance (or custom subclass instance)
+    acting as a persistent dictionary. A `ValueError` is raised if `name` is
+    empty or not provided.
+
+    ```python
+    from pyscript import storage
+
+
+    # Basic usage.
+    user_data = await storage("user-profile")
+    user_data["name"] = "Alice"
+    user_data["age"] = 30
+
+    # Multiple independent storages.
+    settings = await storage("app-settings")
+    cache = await storage("api-cache")
+
+    # With custom Storage class.
+    class ValidatingStorage(Storage):
+        def __setitem__(self, key, value):
+            if not isinstance(key, str):
+                raise TypeError("Keys must be strings")
+            super().__setitem__(key, value)
+
+    validated = await storage("validated-data", ValidatingStorage)
+    ```
+
+    Storage names are automatically prefixed with `"@pyscript/"` to
+    namespace them within IndexedDB.
+    """
     if not name:
-        msg = "The storage name must be defined"
-        raise ValueError(msg)
-    return storage_class(await _storage(f"@pyscript/{name}"))
+        raise ValueError("Storage name must be a non-empty string")
+
+    underlying_store = await _polyscript_storage(f"@pyscript/{name}")
+    return storage_class(underlying_store)
diff --git a/core/src/stdlib/pyscript/util.py b/core/src/stdlib/pyscript/util.py
index 263c6451..1b1b3616 100644
--- a/core/src/stdlib/pyscript/util.py
+++ b/core/src/stdlib/pyscript/util.py
@@ -1,11 +1,24 @@
+"""
+This module contains general-purpose utility functions that don't fit into
+more specific modules. These utilities handle cross-platform compatibility
+between Pyodide and MicroPython, feature detection, and common type
+conversions:
+
+- `as_bytearray`: Convert JavaScript `ArrayBuffer` to Python `bytearray`.
+- `NotSupported`: Placeholder for unavailable features in specific contexts.
+- `is_awaitable`: Detect `async` functions across Python implementations.
+
+These utilities are primarily used internally by PyScript but are available
+for use in application code when needed.
+"""
+
 import js
-import sys
 import inspect
 
 
 def as_bytearray(buffer):
     """
-    Given a JavaScript ArrayBuffer, convert it to a Python bytearray in a
+    Given a JavaScript `ArrayBuffer`, convert it to a Python `bytearray` in a
     MicroPython friendly manner.
     """
     ui8a = js.Uint8Array.new(buffer)
@@ -42,17 +55,25 @@ class NotSupported:
 def is_awaitable(obj):
     """
     Returns a boolean indication if the passed in obj is an awaitable
-    function. (MicroPython treats awaitables as generator functions, and if
-    the object is a closure containing an async function we need to work
-    carefully.)
+    function. This is interpreter agnostic.
+
+    !!! info
+        MicroPython treats awaitables as generator functions, and if
+        the object is a closure containing an async function or a bound method
+        we need to work carefully.
     """
     from pyscript import config
 
-    if config["type"] == "mpy":  # Is MicroPython?
+    if config["type"] == "mpy":
         # MicroPython doesn't appear to have a way to determine if a closure is
         # an async function except via the repr. This is a bit hacky.
-        if "<closure <generator>" in repr(obj):
+        r = repr(obj)
+        if "<closure <generator>" in r:
             return True
+        # Same applies to bound methods.
+        if "<bound_method" in r and "<generator>" in r:
+            return True
+        # In MicroPython, generator functions are awaitable.
         return inspect.isgeneratorfunction(obj)
 
     return inspect.iscoroutinefunction(obj)
diff --git a/core/src/stdlib/pyscript/web.py b/core/src/stdlib/pyscript/web.py
index a218cf5a..af464086 100644
--- a/core/src/stdlib/pyscript/web.py
+++ b/core/src/stdlib/pyscript/web.py
@@ -1,184 +1,585 @@
-"""Lightweight interface to the DOM and HTML elements."""
+"""
+A lightweight Pythonic interface to the DOM and HTML elements that helps you
+interact with web pages, making it easy to find, create, manipulate, and
+compose HTML elements from Python.
 
-# `when` is not used in this module. It is imported here save the user an additional
-# import (i.e. they can get what they need from `pyscript.web`).
+Highlights include:
 
-# from __future__ import annotations  # CAUTION: This is not supported in MicroPython.
+Use the `page` object to find elements on the current page:
+
+```python
+from pyscript import web
+
+
+# Find by CSS selector (returns an ElementCollection).
+divs = web.page.find("div")
+buttons = web.page.find(".button-class")
+
+# Get element by ID (returns single Element or None).
+header = web.page["header-id"]
+header = web.page["#header-id"]  # the "#" prefix is optional.
+
+# Access page structure.
+web.page.body.append(some_element)
+web.page.title = "New Page Title"
+```
+
+Create new elements and compose them together:
+
+```python
+# Create simple elements.
+div = web.div("Hello, World!")
+paragraph = web.p("Some text", id="my-para", className="text-content")
+
+# Compose elements together.
+container = web.div(
+    web.h1("Title"),
+    web.p("First paragraph"),
+    web.p("Second paragraph"),
+    id="container"
+)
+
+# Add to the page.
+web.page.body.append(container)
+
+# Create with initial attributes.
+link = web.a(
+    "Click me",
+    href="https://example.com",
+    target="_blank",
+    classes=["link", "external"]
+)
+```
+
+Modify element content and attributes:
+
+```python
+# Update content.
+element.innerHTML = "<b>Bold text</b>"
+element.textContent = "Plain text"
+
+# Update attributes.
+element.id = "new-id"
+element.title = "Tooltip text"
+
+# Bulk update with convenience method.
+element.update(
+    classes=["active", "highlighted"],
+    style={"color": "red", "font-size": "16px"},
+    title="Updated tooltip"
+)
+```
+
+An element's CSS classes behave like a Python `set`:
+
+```python
+# Add and remove classes
+element.classes.add("active")
+element.classes.add("highlighted")
+element.classes.remove("hidden")
+
+# Check membership.
+if "active" in element.classes:
+    print("Element is active")
+
+# Clear all classes.
+element.classes.clear()
+
+# Discard (no error if missing).
+element.classes.discard("maybe-not-there")
+```
+
+An element's styles behave like a Python `dict`:
+
+```python
+# Set individual styles.
+element.style["color"] = "red"
+element.style["background-color"] = "#f0f0f0"
+element.style["font-size"] = "16px"
+
+# Remove a style.
+del element.style["margin"]
+
+# Check if style is set.
+if "color" in element.style:
+    print(f"Color is {element.style['color']}")
+```
+
+Update multiple elements at once via an `ElementCollection`:
+
+```python
+# Find multiple elements (returns an ElementCollection).
+items = web.page.find(".list-item")
+
+# Iterate over collection.
+for item in items:
+    item.innerHTML = "Updated"
+    item.classes.add("processed")
+
+# Bulk update all elements.
+items.update_all(
+    innerHTML="Hello",
+    className="updated-item"
+)
+
+# Index and slice collections.
+first = items[0]
+subset = items[1:3]
+
+# Get an element by ID within the collection.
+special = items["special-id"]
+
+# Find descendants within the collection.
+subitems = items.find(".sub-item")
+```
+
+Manage `select` element options (also for `datalist` and `optgroup`):
+
+```python
+# Get existing select.
+select = web.page["my-select"]
+
+# Add options.
+select.options.add(value="1", html="Option 1")
+select.options.add(value="2", html="Option 2", selected=True)
+
+# Get selected option.
+selected = select.options.selected
+print(f"Selected: {selected.value}")
+
+# Iterate over options.
+for option in select.options:
+    print(f"{option.value}: {option.innerHTML}")
+
+# Clear all options.
+select.options.clear()
+
+# Remove specific option by index.
+select.options.remove(0)
+```
+
+Attach event handlers to elements:
+
+```python
+from pyscript import when
+
+button = web.button("Click me", id="my-button")
+
+# Use the when decorator.
+@when("click", button)
+def handle_click(event):
+    print("Button clicked!")
+
+# Or add directly to the event.
+def another_handler(event):
+    print("Another handler")
+
+button.on_click.add_listener(another_handler)
+
+# Pass handler during creation.
+button = web.button("Click", on_click=handle_click)
+```
+
+All `Element` instances provide direct access to the underlying DOM element
+via attribute delegation:
+
+```python
+# Most DOM methods are accessible directly.
+element.scrollIntoView()
+element.focus()
+element.blur()
+
+# But we do have a historic convenience method for scrolling into view.
+element.show_me()  # Calls scrollIntoView()
+
+# Access the raw DOM element when needed for special cases.
+dom_element = element._dom_element
+```
+
+The main entry point is the `page` object, which represents the current
+document and provides access to common elements like `page.body` and methods
+like `page.find()` for querying the DOM.
+"""
 
 from pyscript import document, when, Event  # noqa: F401
 from pyscript.ffi import create_proxy, is_none
 
 
-def wrap_dom_element(dom_element):
-    """Wrap an existing DOM element in an instance of a subclass of `Element`.
+# Utility functions for finding and wrapping DOM elements.
 
-    This is just a convenience function to avoid having to import the `Element` class
-    and use its class method.
+
+def _wrap_if_not_none(dom_element):
     """
+    Wrap a `dom_element`, returning `None` if the element is `None`/`null`.
+    """
+    return Element.wrap_dom_element(dom_element) if not is_none(dom_element) else None
 
-    return Element.wrap_dom_element(dom_element)
+
+def _find_by_id(dom_node, target_id):
+    """
+    Find an element by `id` within a `dom_node`.
+
+    The `target_id` can optionally start with '#'. Returns a wrapped `Element`
+    or `None` if not found.
+    """
+    element_id = target_id[1:] if target_id.startswith("#") else target_id
+    result = dom_node.querySelector(f"#{element_id}")
+    return _wrap_if_not_none(result)
+
+
+def _find_and_wrap(dom_node, selector):
+    """
+    Find all descendants of `dom_node` matching the CSS `selector`.
+
+    Returns an `ElementCollection` of wrapped elements.
+    """
+    return ElementCollection.wrap_dom_elements(dom_node.querySelectorAll(selector))
 
 
 class Element:
-    # A lookup table to get an `Element` subclass by tag name. Used when wrapping an
-    # existing DOM element.
+    """
+    The base class for all [HTML elements](https://developer.mozilla.org/en-US/docs/Web/HTML/Reference/Elements).
+
+    Provides a Pythonic interface to DOM elements with support for attributes,
+    events, styles, classes, and DOM manipulation. It can create new elements
+    or wrap existing DOM elements.
+
+    Elements are typically created using the tag-specific classes found
+    within this namespace (e.g. `web.div`, `web.span`, `web.button`):
+
+    ```python
+    from pyscript import web
+
+
+    # Create a simple div.
+    div = web.div("Hello, World!")
+
+    # Create with attributes.
+    link = web.a("Click me", href="https://example.com", target="_blank")
+
+    # Create with classes and styles.
+    button = web.button(
+        "Submit",
+        classes=["primary", "large"],
+        style={"background-color": "blue", "color": "white"},
+        id="submit-btn"
+    )
+    ```
+
+    !!! info
+
+        Some elements have an underscore suffix in their class names (e.g.
+        `select_`, `input_`).
+
+        This is to avoid clashes with Python keywords. The underscore is removed
+        when determining the actual HTML tag name.
+
+    Wrap existing DOM elements found on the page:
+
+    ```python
+    # Find and wrap an element by CSS selector.
+    existing = web.page.find(".my_class")[0]
+
+    # Or, better, just use direct ID lookup (with or without the
+    # leading '#').
+    existing = web.page["my-element"]
+    ```
+
+    Element attributes are accessible as Python properties:
+
+    ```python
+    # Get attributes.
+    element_id = div.id
+    element_title = div.title
+    element_href = link.href
+
+    # Set attributes.
+    div.id = "new-id"
+    div.title = "Tooltip text"
+    link.href = "https://new-url.com"
+
+    # HTML content.
+    div.innerHTML = "<b>Bold text</b>"
+    div.textContent = "Plain text"
+    ```
+
+    CSS classes are managed through a `set`-like interface:
+
+    ```python
+    # Add classes.
+    element.classes.add("active")
+    element.classes.add("highlighted")
+
+    # Remove classes.
+    element.classes.remove("inactive")
+    element.classes.discard("maybe-missing")  # No error if absent
+
+    # Check membership.
+    if "active" in element.classes:
+        print("Element is active")
+
+    # Iterate over classes.
+    for cls in element.classes:
+        print(cls)
+    ```
+
+    Explicit CSS styles are managed through a `dict`-like interface:
+
+    ```python
+    # Set styles using CSS property names (hyphenated).
+    element.style["color"] = "red"
+    element.style["background-color"] = "#f0f0f0"
+    element.style["font-size"] = "16px"
+
+    # Get styles.
+    color = element.style["color"]
+
+    # Remove styles.
+    del element.style["margin"]
+    ```
+
+    Add, find, and navigate elements:
+
+    ```python
+    # Append children.
+    parent.append(child_element)
+    parent.append(child1, child2, child3)  # Multiple at once
+
+    # Find descendants using CSS selectors.
+    buttons = parent.find("button")
+    items = parent.find(".item-class")
+
+    # Navigate the tree.
+    child = parent.children[0]
+    parent_elem = child.parent
+
+    # Access children by index or slice.
+    first_child = parent[0]
+    first_three = parent[0:3]
+
+    # Get a child explicitly by ID. Returns None if not found.
+    specific = parent["child-id"]
+    ```
+
+    Attach event listeners to elements:
+
+    ```python
+    button = web.button("Click me")
+
+    # Use the @when decorator with event name.
+    from pyscript import when
+
+    @when("click", button)
+    def handle_click(event):
+        print("Clicked!")
+
+    # Or use the on_* event directly with @when.
+    @when(button.on_click)
+    def handle_click(event):
+        print("Also works!")
+
+    # Pass handlers during element creation.
+    button = web.button("Click", on_click=handle_click)
+    ```
+
+    Update multiple properties at once:
+
+    ```python
+    element.update(
+        classes=["active", "highlighted"],
+        style={"color": "red", "font-size": "20px"},
+        id="updated-id",
+        title="New tooltip"
+    )
+    ```
+
+    !!! warning
+        **Some HTML attributes clash with Python keywords and use trailing
+        underscores**.
+
+    Use `for_` instead of `for`, and `class_` instead of `class`.
+
+    ```python
+    # The 'for' attribute (on labels)
+    label = web.label("Username", for_="username-input")
+
+    # The 'class' attribute (although 'classes' is preferred)
+    div.class_ = "my-class"
+    ```
+
+    Create copies of elements:
+
+    ```python
+    original = web.div("Original content", id="original")
+    clone = original.clone(clone_id="cloned")
+    ```
+
+    Access the underlying DOM element when needed:
+
+    ```python
+    # Most DOM properties and methods are accessible directly.
+    element.focus()
+    element.scrollIntoView()
+    bounding_rect = element.getBoundingClientRect()
+
+    # Or access the raw DOM element.
+    dom_element = element._dom_element
+    ```
+    """
+
+    # Lookup table: tag name -> Element subclass.
     element_classes_by_tag_name = {}
 
     @classmethod
     def get_tag_name(cls):
-        """Return the HTML tag name for the class.
-
-        For classes that have a trailing underscore (because they clash with a Python
-        keyword or built-in), we remove it to get the tag name. e.g. for the `input_`
-        class, the tag name is `input`.
+        """
+        Get the HTML tag name for this class.
 
+        Classes ending with underscore (e.g. `input_`) have it removed to get
+        the actual HTML tag name.
         """
         return cls.__name__.replace("_", "")
 
     @classmethod
     def register_element_classes(cls, element_classes):
-        """Register an iterable of element classes."""
+        """
+        Register `Element` subclasses for tag-based lookup.
+        """
         for element_class in element_classes:
             tag_name = element_class.get_tag_name()
             cls.element_classes_by_tag_name[tag_name] = element_class
 
     @classmethod
     def unregister_element_classes(cls, element_classes):
-        """Unregister an iterable of element classes."""
+        """
+        Unregister `Element` subclasses from tag-based lookup.
+        """
         for element_class in element_classes:
             tag_name = element_class.get_tag_name()
             cls.element_classes_by_tag_name.pop(tag_name, None)
 
     @classmethod
     def wrap_dom_element(cls, dom_element):
-        """Wrap an existing DOM element in an instance of a subclass of `Element`.
+        """
+        Wrap a DOM element in the appropriate `Element` subclass.
 
-        We look up the `Element` subclass by the DOM element's tag name. For any unknown
-        elements (custom tags etc.) use *this* class (`Element`).
+        Looks up the subclass by tag name. Unknown tags use the base `Element`
+        class.
         """
         element_cls = cls.element_classes_by_tag_name.get(
             dom_element.tagName.lower(), cls
         )
-
         return element_cls(dom_element=dom_element)
 
     def __init__(self, dom_element=None, classes=None, style=None, **kwargs):
-        """Create a new, or wrap an existing DOM element.
-
-        If `dom_element` is None we are being called to *create* a new element.
-        Otherwise, we are being called to *wrap* an existing DOM element.
         """
-        self._dom_element = (
-            document.createElement(type(self).get_tag_name())
-            if is_none(dom_element)
-            else dom_element
-        )
+        Create or wrap a DOM element.
 
-        # HTML on_events attached to the element become pyscript.Event instances.
+        If `dom_element` is `None`, this creates a new element. Otherwise wraps
+        the provided DOM element. The `**kwargs` can include HTML attributes
+        and event handlers (names starting with `on_`).
+        """
+        # Create or wrap the DOM element.
+        if is_none(dom_element):
+            self._dom_element = document.createElement(type(self).get_tag_name())
+        else:
+            self._dom_element = dom_element
+        # Event handling.
         self._on_events = {}
-
-        # Handle kwargs for handling named events with a default handler function.
-        properties = {}
-        for name, handler in kwargs.items():
-            if name.startswith("on_"):
-                ev = self.get_event(name)  # Create the default Event instance.
-                ev.add_listener(handler)
-            else:
-                properties[name] = handler
-
-        # A set-like interface to the element's `classList`.
-        self._classes = Classes(self)
-
-        # A dict-like interface to the element's `style` attribute.
-        self._style = Style(self)
-
-        # Set any specified classes, styles, and DOM properties.
-        self.update(classes=classes, style=style, **properties)
+        self.update(classes=classes, style=style, **kwargs)
 
     def __eq__(self, obj):
-        """Check for equality by comparing the underlying DOM element."""
+        """
+        Check equality by comparing underlying DOM elements.
+        """
         return isinstance(obj, Element) and obj._dom_element == self._dom_element
 
     def __getitem__(self, key):
-        """Get an item within the element's children.
-
-        If `key` is an integer or a slice we use it to index/slice the element's
-        children. Otherwise, we use `key` as a query selector.
         """
+        Get an item within this element.
+
+        Behaviour depends on the key type:
+
+        - Integer: returns the child at that index.
+        - Slice: returns a collection of children in that slice.
+        - String: looks up an element by id (with or without '#' prefix).
+
+        ```python
+        element[0]          # First child.
+        element[1:3]        # Second and third children.
+        element["my-id"]    # Element with id="my-id" (or None).
+        element["#my-id"]   # Same as above (# is optional).
+        ```
+        """
+
         if isinstance(key, (int, slice)):
             return self.children[key]
-
-        return self.find(key)
+        if isinstance(key, str):
+            return _find_by_id(self._dom_element, key)
+        raise TypeError(
+            f"Element indices must be integers, slices, or strings, "
+            f"not {type(key).__name__}."
+        )
 
     def __getattr__(self, name):
         """
         Get an attribute from the element.
 
-        If the attribute is an event (e.g. "on_click"), we wrap it in an `Event`
-        instance and return that. Otherwise, we return the attribute from the
-        underlying DOM element.
+        Attributes starting with `on_` return `Event` instances. Other
+        attributes are retrieved from the underlying DOM element.
         """
         if name.startswith("on_"):
             return self.get_event(name)
-        # This allows us to get attributes on the underlying DOM element that clash
-        # with Python keywords or built-ins (e.g. the output element has an
-        # attribute `for` which is a Python keyword, so you can access it on the
-        # Element instance via `for_`).
-        if name.endswith("_"):
-            name = name[:-1]  # noqa: FURB188 No str.removesuffix() in MicroPython.
-        if name == "for":
-            # The `for` attribute is a special case as it is a keyword in both
-            # Python and JavaScript.
-            # We need to get it from the underlying DOM element as `htmlFor`.
-            name = "htmlFor"
-        return getattr(self._dom_element, name)
+        dom_name = self._normalize_attribute_name(name)
+        return getattr(self._dom_element, dom_name)
 
     def __setattr__(self, name, value):
-        # This class overrides `__setattr__` to delegate "public" attributes to the
-        # underlying DOM element. BUT, we don't use the usual Python pattern where
-        # we set attributes on the element itself via `self.__dict__` as that is not
-        # yet supported in our build of MicroPython. Instead, we handle it here by
-        # using super for all "private" attributes (those starting with an underscore).
+        """
+        Set an attribute on the element.
+
+        Private attributes (starting with `_`) are set on the Python object.
+        Public attributes are set on the underlying DOM element. Attributes
+        starting with `on_` are treated as events.
+        """
         if name.startswith("_"):
             super().__setattr__(name, value)
-
+        elif name.startswith("on_"):
+            # Separate events...
+            self.get_event(name).add_listener(value)
         else:
-            # This allows us to set attributes on the underlying DOM element that clash
-            # with Python keywords or built-ins (e.g. the output element has an
-            # attribute `for` which is a Python keyword, so you can access it on the
-            # Element instance via `for_`).
-            if name.endswith("_"):
-                name = name[:-1]  # noqa: FURB188 No str.removesuffix() in MicroPython.
-            if name == "for":
-                # The `for` attribute is a special case as it is a keyword in both
-                # Python and JavaScript.
-                # We need to set it on the underlying DOM element as `htmlFor`.
-                name = "htmlFor"
+            # ...from regular attributes.
+            dom_name = self._normalize_attribute_name(name)
+            setattr(self._dom_element, dom_name, value)
 
-            if name.startswith("on_"):
-                # Ensure on-events are cached in the _on_events dict if the
-                # user is setting them directly.
-                self._on_events[name] = value
+    def _normalize_attribute_name(self, name):
+        """
+        Normalize Python attribute names to DOM attribute names.
 
-            setattr(self._dom_element, name, value)
+        Removes trailing underscores and maps special cases.
+        """
+        if name.endswith("_"):
+            name = name[:-1]
+        if name == "for":
+            return "htmlFor"
+        if name == "class":
+            return "className"
+        return name
 
     def get_event(self, name):
         """
         Get an `Event` instance for the specified event name.
+
+        Event names must start with `on_` (e.g. `on_click`). Creates and
+        caches `Event` instances that are triggered when the DOM event fires.
         """
         if not name.startswith("on_"):
-            msg = "Event names must start with 'on_'."
-            raise ValueError(msg)
-        event_name = name[3:]  # Remove the "on_" prefix.
+            raise ValueError("Event names must start with 'on_'.")
+        event_name = name[3:]  # Remove 'on_' prefix.
         if not hasattr(self._dom_element, event_name):
-            msg = f"Element has no '{event_name}' event."
-            raise ValueError(msg)
+            raise ValueError(f"Element has no '{event_name}' event.")
         if name in self._on_events:
             return self._on_events[name]
-        # Such an on-event exists in the DOM element, but we haven't yet
-        # wrapped it in an Event instance. Let's do that now. When the
-        # underlying DOM element's event is triggered, the Event instance
-        # will be triggered too.
+        # Create Event instance and wire it to the DOM event.
         ev = Event()
         self._on_events[name] = ev
         self._dom_element.addEventListener(event_name, create_proxy(ev.trigger))
@@ -186,199 +587,307 @@ class Element:
 
     @property
     def children(self):
-        """Return the element's children as an `ElementCollection`."""
+        """
+        Return this element's children as an `ElementCollection`.
+        """
         return ElementCollection.wrap_dom_elements(self._dom_element.children)
 
     @property
     def classes(self):
-        """Return the element's `classList` as a `Classes` instance."""
+        """
+        Return the element's CSS classes as a `set`-like `Classes` object.
+
+        Supports set operations: `add`, `remove`, `discard`, `clear`.
+        Check membership with `in`, iterate with `for`, get length with `len()`.
+
+        ```python
+        element.classes.add("active")
+        if "disabled" in element.classes:
+            ...
+        ```
+        """
+        if not hasattr(self, "_classes"):
+            self._classes = Classes(self)
         return self._classes
 
-    @property
-    def parent(self):
-        """Return the element's `parent `Element`."""
-        if is_none(self._dom_element.parentElement):
-            return None
-
-        return Element.wrap_dom_element(self._dom_element.parentElement)
-
     @property
     def style(self):
-        """Return the element's `style` attribute as a `Style` instance."""
+        """
+        Return the element's CSS styles as a `dict`-like `Style` object.
+
+        Access using `dict`-style syntax with standard
+        [CSS property names (hyphenated)](https://developer.mozilla.org/en-US/docs/Web/CSS/Reference).
+
+        ```python
+        element.style["background-color"] = "red"
+        element.style["font-size"] = "16px"
+        del element.style["margin"]
+        ```
+        """
+        if not hasattr(self, "_style"):
+            self._style = Style(self)
         return self._style
 
+    @property
+    def parent(self):
+        """
+        Return this element's parent `Element`, or `None`.
+        """
+        if is_none(self._dom_element.parentElement):
+            return None
+        return Element.wrap_dom_element(self._dom_element.parentElement)
+
     def append(self, *items):
-        """Append the specified items to the element."""
+        """
+        Append items to this element's `children`.
+
+        Accepts `Element` instances, `ElementCollection` instances, lists,
+        tuples, raw DOM elements, and NodeLists.
+        """
         for item in items:
             if isinstance(item, Element):
                 self._dom_element.appendChild(item._dom_element)
-
             elif isinstance(item, ElementCollection):
                 for element in item:
                     self._dom_element.appendChild(element._dom_element)
-
-            # We check for list/tuple here and NOT for any iterable as it will match
-            # a JS Nodelist which is handled explicitly below.
-            # NodeList.
             elif isinstance(item, (list, tuple)):
                 for child in item:
                     self.append(child)
-
+            elif hasattr(item, "tagName"):
+                # Raw DOM element.
+                self._dom_element.appendChild(item)
+            elif hasattr(item, "length"):
+                # NodeList or similar iterable.
+                for element in item:
+                    self._dom_element.appendChild(element)
             else:
-                # In this case we know it's not an Element or an ElementCollection, so
-                # we guess that it's either a DOM element or NodeList returned via the
-                # ffi.
-                try:
-                    # First, we try to see if it's an element by accessing the 'tagName'
-                    # attribute.
-                    item.tagName
-                    self._dom_element.appendChild(item)
-
-                except AttributeError:
-                    try:
-                        # Ok, it's not an element, so let's see if it's a NodeList by
-                        # accessing the 'length' attribute.
-                        item.length
-                        for element_ in item:
-                            self._dom_element.appendChild(element_)
-
-                    except AttributeError:
-                        # Nope! This is not an element or a NodeList.
-                        msg = (
-                            f'Element "{item}" is a proxy object, "'
-                            f"but not a valid element or a NodeList."
-                        )
-                        raise TypeError(msg)
+                raise TypeError(f"Cannot append {type(item).__name__} to element.")
 
     def clone(self, clone_id=None):
-        """Make a clone of the element (clones the underlying DOM object too)."""
+        """
+        Clone this element and its underlying DOM element.
+
+        Optionally assign a new `id` to the clone.
+        """
         clone = Element.wrap_dom_element(self._dom_element.cloneNode(True))
         clone.id = clone_id
         return clone
 
     def find(self, selector):
-        """Find all elements that match the specified selector.
-
-        Return the results as a (possibly empty) `ElementCollection`.
         """
-        return ElementCollection.wrap_dom_elements(
-            self._dom_element.querySelectorAll(selector)
-        )
+        Find all descendant elements matching the
+        [CSS `selector`](https://developer.mozilla.org/en-US/docs/Web/CSS/Guides/Selectors).
+
+        Returns an `ElementCollection` (possibly empty).
+
+        ```python
+        element.find("div")              # All div descendants.
+        element.find(".my-class")        # All elements with class.
+        element.find("#my-id")           # Element with id (as collection).
+        element.find("div.my-class")     # All divs with class.
+        ```
+        """
+        return _find_and_wrap(self._dom_element, selector)
 
     def show_me(self):
-        """Convenience method for 'element.scrollIntoView()'."""
+        """
+        Scroll this element into view.
+        """
         self._dom_element.scrollIntoView()
 
     def update(self, classes=None, style=None, **kwargs):
-        """Update the element with the specified classes, styles, and DOM properties."""
+        """
+        Update this element's `classes`, `style`, and `attributes`
+        (via arbitrary `**kwargs`).
 
+        Convenience method for bulk updates.
+        """
         if classes:
-            self.classes.add(classes)
-
+            if isinstance(classes, str):
+                self.classes.add(classes)
+            else:
+                for class_name in classes:
+                    self.classes.add(class_name)
         if style:
-            self.style.set(**style)
-
+            for key, value in style.items():
+                self.style[key] = value
         for name, value in kwargs.items():
             setattr(self, name, value)
 
 
-class Classes:
-    """A set-like interface to an element's `classList`."""
+class Classes(set):
+    """
+    Behaves like a Python `set` with changes automatically reflected in the
+    element's `classList`.
 
-    def __init__(self, element: Element):
-        self._element = element
-        self._class_list = self._element._dom_element.classList
+    ```python
+    # Add and remove classes.
+    element.classes.add("active")
+    element.classes.remove("inactive")
+    element.classes.discard("maybe-missing")  # No error if absent.
 
-    def __contains__(self, item):
-        return item in self._class_list
+    # Check membership.
+    if "active" in element.classes:
+        print("Element is active")
 
-    def __eq__(self, other):
-        # We allow comparison with either another `Classes` instance...
-        if isinstance(other, Classes):
-            compare_with = list(other._class_list)
+    # Clear all classes.
+    element.classes.clear()
 
-        # ...or iterables of strings.
-        else:
-            # TODO: Check MP for existence of better iterable test.
-            try:
-                compare_with = iter(other)
+    # Iterate over classes.
+    for cls in element.classes:
+        print(cls)
+    ```
+    """
 
-            except TypeError:
-                return False
+    def __init__(self, element):
+        """Initialise the Classes set for the given element."""
+        self._class_list = element._dom_element.classList
+        super().__init__(self._class_list)
 
-        return set(self._class_list) == set(compare_with)
+    def _extract_class_names(self, class_name):
+        """
+        If the class_name contains several class names separated by spaces,
+        split them and return as a list. Otherwise, return the class_name as is
+        in a list.
+        """
+        return (
+            [name for name in class_name.split() if name]
+            if " " in class_name
+            else [class_name]
+        )
 
-    def __iter__(self):
-        return iter(self._class_list)
+    def add(self, class_name):
+        """Add a class."""
+        for name in self._extract_class_names(class_name):
+            super().add(name)
+            self._class_list.add(name)
 
-    def __len__(self):
-        return self._class_list.length
+    def remove(self, class_name):
+        """Remove a class."""
+        for name in self._extract_class_names(class_name):
+            super().remove(name)
+            self._class_list.remove(name)
 
-    def __repr__(self):
-        return f"Classes({', '.join(self._class_list)})"
+    def discard(self, class_name):
+        """Remove a class if present."""
+        for name in self._extract_class_names(class_name):
+            super().discard(name)
+            if name in self._class_list:
+                self._class_list.remove(name)
 
-    def __str__(self):
-        return " ".join(self._class_list)
+    def clear(self):
+        """Remove all classes."""
+        super().clear()
+        while self._class_list.length > 0:
+            self._class_list.remove(self._class_list.item(0))
 
-    def add(self, *class_names):
-        """Add one or more classes to the element."""
-        for class_name in class_names:
-            if isinstance(class_name, list):
-                for item in class_name:
-                    self.add(item)
 
-            else:
-                self._class_list.add(class_name)
+class Style(dict):
+    """
+    Behaves like a Python `dict` with changes automatically reflected in the
+    element's `style` attribute.
 
-    def contains(self, class_name):
-        """Check if the element has the specified class."""
-        return class_name in self
+    ```python
+    # Set and get styles using CSS property names (hyphenated).
+    element.style["color"] = "red"
+    element.style["background-color"] = "#f0f0f0"
+    element.style["font-size"] = "16px"
 
-    def remove(self, *class_names):
-        """Remove one or more classes from the element."""
-        for class_name in class_names:
-            if isinstance(class_name, list):
-                for item in class_name:
-                    self.remove(item)
+    # Get a style value.
+    color = element.style["color"]
 
-            else:
-                self._class_list.remove(class_name)
+    # Remove a style.
+    del element.style["margin"]
 
-    def replace(self, old_class, new_class):
-        """Replace one of the element's classes with another."""
-        self.remove(old_class)
-        self.add(new_class)
+    # Check if a style is set.
+    if "color" in element.style:
+        print(f"Color is {element.style['color']}")
+    ```
+    """
 
-    def toggle(self, *class_names):
-        """Toggle one or more of the element's classes."""
-        for class_name in class_names:
-            if class_name in self:
-                self.remove(class_name)
+    def __init__(self, element):
+        """Initialise the Style dict for the given element."""
+        self._style = element._dom_element.style
+        super().__init__()
 
-            else:
-                self.add(class_name)
+    def __setitem__(self, key, value):
+        """Set a style property."""
+        super().__setitem__(key, value)
+        self._style.setProperty(key, str(value))
+
+    def __delitem__(self, key):
+        """Remove a style property."""
+        super().__delitem__(key)
+        self._style.removeProperty(key)
 
 
 class HasOptions:
-    """Mix-in for elements that have an options attribute.
+    """
+    Mixin for elements with options (`datalist`, `optgroup`, `select`).
 
-    The elements that support options are: <datalist>, <optgroup>, and <select>.
+    Provides an `options` property that returns an `Options` instance. Used
+    in conjunction with the `Options` class.
+
+    ```python
+    # Get a select element and work with its options.
+    select = web.page["my-select"]
+
+    # Add options.
+    select.options.add(value="1", html="Option 1")
+    select.options.add(value="2", html="Option 2", selected=True)
+
+    # Get the selected option.
+    selected = select.options.selected
+
+    # Iterate over options.
+    for option in select.options:
+        print(f"{option.value}: {option.innerHTML}")
+
+    # Clear all options.
+    select.options.clear()
+    ```
     """
 
     @property
     def options(self):
-        """Return the element's options as an `Options"""
+        """Return this element's options as an `Options` instance."""
         if not hasattr(self, "_options"):
             self._options = Options(self)
-
         return self._options
 
 
 class Options:
-    """This class represents the <option>s of a <datalist>, <optgroup> or <select>.
+    """
+    Interface to the options of a `datalist`, `optgroup`, or `select` element.
 
-    It allows access to add and remove <option>s by using the `add`, `remove` and
-    `clear` methods.
+    Supports adding, removing, and accessing option elements. Used in
+    conjunction with the `HasOptions` mixin.
+
+    ```python
+    # Add options to a select element.
+    select.options.add(value="1", html="Option 1")
+    select.options.add(value="2", html="Option 2", selected=True)
+
+    # Insert option at specific position.
+    select.options.add(value="1.5", html="Option 1.5", before=1)
+
+    # Access options by index.
+    first_option = select.options[0]
+
+    # Get the selected option.
+    selected = select.options.selected
+    print(f"Selected: {selected.value}")
+
+    # Iterate over all options.
+    for option in select.options:
+        print(option.innerHTML)
+
+    # Remove option by index.
+    select.options.remove(0)
+
+    # Clear all options.
+    select.options.clear()
+    ```
     """
 
     def __init__(self, element):
@@ -394,30 +903,39 @@ class Options:
         return len(self.options)
 
     def __repr__(self):
-        return f"{self.__class__.__name__} (length: {len(self)}) {self.options}"
+        return f"{self.__class__.__name__} (length: {len(self)}) " f"{self.options}"
 
     @property
     def options(self):
-        """Return the list of options."""
+        """
+        Return the list of option elements.
+        """
         return [Element.wrap_dom_element(o) for o in self._element._dom_element.options]
 
     @property
     def selected(self):
-        """Return the selected option."""
+        """
+        Return the currently selected option.
+        """
         return self.options[self._element._dom_element.selectedIndex]
 
     def add(self, value=None, html=None, text=None, before=None, **kwargs):
-        """Add a new option to the element"""
-        if value is not None:
+        """
+        Add a new option to the element.
+
+        Can specify `value`, `html` content, and `text`. The `before` parameter can
+        be an `Element` or index to insert before. The `**kwargs` are additional
+        arbitrary attributes for the new option element.
+        """
+        if value:
             kwargs["value"] = value
-
-        if html is not None:
+        if html:
             kwargs["innerHTML"] = html
-
-        if text is not None:
+        if text:
             kwargs["text"] = text
 
-        new_option = option(**kwargs)
+        # The `option` element class is dynamically created below.
+        new_option = option(**kwargs)  # noqa: F821
 
         if before and isinstance(before, Element):
             before = before._dom_element
@@ -425,56 +943,62 @@ class Options:
         self._element._dom_element.add(new_option._dom_element, before)
 
     def clear(self):
-        """Remove all options."""
-        while len(self) > 0:
-            self.remove(0)
+        """
+        Remove all options.
+        """
+        self._element._dom_element.length = 0
 
     def remove(self, index):
-        """Remove the option at the specified index."""
+        """
+        Remove the option at the specified `index`.
+        """
         self._element._dom_element.remove(index)
 
 
-class Style:
-    """A dict-like interface to an element's `style` attribute."""
-
-    def __init__(self, element: Element):
-        self._element = element
-        self._style = self._element._dom_element.style
-
-    def __getitem__(self, key):
-        return self._style.getPropertyValue(key)
-
-    def __setitem__(self, key, value):
-        self._style.setProperty(key, value)
-
-    def remove(self, key):
-        """Remove a CSS property from the element."""
-        self._style.removeProperty(key)
-
-    def set(self, **kwargs):
-        """Set one or more CSS properties on the element."""
-        for key, value in kwargs.items():
-            self._element._dom_element.style.setProperty(key, value)
-
-    # CSS Properties
-    # Reference: https://github.com/microsoft/TypeScript/blob/main/src/lib/dom.generated.d.ts#L3799C1-L5005C2
-    # Following properties automatically generated from the above reference using
-    # tools/codegen_css_proxy.py
-    @property
-    def visible(self):
-        return self._element._dom_element.style.visibility
-
-    @visible.setter
-    def visible(self, value):
-        self._element._dom_element.style.visibility = value
-
-
 class ContainerElement(Element):
-    """Base class for elements that can contain other elements."""
+    """
+    Base class for elements that can contain other elements.
+
+    Extends `Element` with convenient child handling during initialization.
+
+    ```python
+    from pyscript import web
+
+
+    # Create with child elements as arguments.
+    div = web.div(
+        web.h1("Title"),
+        web.p("Paragraph 1"),
+        web.p("Paragraph 2")
+    )
+
+    # Or use the children keyword argument.
+    div = web.div(children=[web.p("Child 1"), web.p("Child 2")])
+
+    # Mix elements and HTML strings.
+    div = web.div(
+        web.h1("Title"),
+        "<p>HTML content</p>",
+        web.button("Click me")
+    )
+
+    # Iterate over children.
+    for child in div:
+        print(child.innerHTML)
+    ```
+    """
 
     def __init__(
         self, *args, children=None, dom_element=None, style=None, classes=None, **kwargs
     ):
+        """
+        Create a container element with optional `children`.
+
+        Children can be passed as positional `*args` or via the `children`
+        keyword argument. String children are inserted as unescaped HTML. The
+        `style`, `classes`, and `**kwargs` are passed to the base `Element`
+        initializer.
+        """
         super().__init__(
             dom_element=dom_element, style=style, classes=classes, **kwargs
         )
@@ -482,7 +1006,6 @@ class ContainerElement(Element):
         for child in list(args) + (children or []):
             if isinstance(child, (Element, ElementCollection)):
                 self.append(child)
-
             else:
                 self._dom_element.insertAdjacentHTML("beforeend", child)
 
@@ -490,124 +1013,93 @@ class ContainerElement(Element):
         yield from self.children
 
 
-class ClassesCollection:
-    """A set-like interface to the classes of the elements in a collection."""
-
-    def __init__(self, collection):
-        self._collection = collection
-
-    def __contains__(self, class_name):
-        for element in self._collection:
-            if class_name in element.classes:
-                return True
-
-        return False
-
-    def __eq__(self, other):
-        return (
-            isinstance(other, ClassesCollection)
-            and self._collection == other._collection
-        )
-
-    def __iter__(self):
-        yield from self._all_class_names()
-
-    def __len__(self):
-        return len(self._all_class_names())
-
-    def __repr__(self):
-        return f"ClassesCollection({self._collection!r})"
-
-    def __str__(self):
-        return " ".join(self._all_class_names())
-
-    def add(self, *class_names):
-        """Add one or more classes to the elements in the collection."""
-        for element in self._collection:
-            element.classes.add(*class_names)
-
-    def contains(self, class_name):
-        """Check if any element in the collection has the specified class."""
-        return class_name in self
-
-    def remove(self, *class_names):
-        """Remove one or more classes from the elements in the collection."""
-
-        for element in self._collection:
-            element.classes.remove(*class_names)
-
-    def replace(self, old_class, new_class):
-        """Replace one of the classes in the elements in the collection with another."""
-        for element in self._collection:
-            element.classes.replace(old_class, new_class)
-
-    def toggle(self, *class_names):
-        """Toggle one or more classes on the elements in the collection."""
-        for element in self._collection:
-            element.classes.toggle(*class_names)
-
-    def _all_class_names(self):
-        all_class_names = set()
-        for element in self._collection:
-            for class_name in element.classes:
-                all_class_names.add(class_name)
-
-        return all_class_names
-
-
-class StyleCollection:
-    """A dict-like interface to the styles of the elements in a collection."""
-
-    def __init__(self, collection):
-        self._collection = collection
-
-    def __getitem__(self, key):
-        return [element.style[key] for element in self._collection._elements]
-
-    def __setitem__(self, key, value):
-        for element in self._collection._elements:
-            element.style[key] = value
-
-    def __repr__(self):
-        return f"StyleCollection({self._collection!r})"
-
-    def remove(self, key):
-        """Remove a CSS property from the elements in the collection."""
-        for element in self._collection._elements:
-            element.style.remove(key)
-
-
 class ElementCollection:
+    """
+    A collection of Element instances with `list`-like operations.
+
+    Supports iteration, indexing, slicing, and finding descendants.
+    For bulk operations, iterate over the collection explicitly or use
+    the `update_all` method.
+
+    ```python
+    # Get a collection of elements.
+    items = web.page.find(".item")
+
+    # Access by index.
+    first = items[0]
+    last = items[-1]
+
+    # Slice the collection.
+    subset = items[1:3]
+
+    # Look up a specific element by id (returns None if not found).
+    specific = items["item-id"]
+
+    # Iterate over elements.
+    for item in items:
+        item.innerHTML = "Updated"
+        item.classes.add("processed")
+
+    # Bulk update all contained elements.
+    items.update_all(innerHTML="Hello", className="updated")
+
+    # Find matches within the collection.
+    buttons = items.find("button")
+
+    # Get the count.
+    count = len(items)
+    ```
+    """
+
     @classmethod
     def wrap_dom_elements(cls, dom_elements):
-        """Wrap an iterable of dom_elements in an `ElementCollection`."""
-
+        """
+        Wrap an iterable of DOM elements in an `ElementCollection`.
+        """
         return cls(
             [Element.wrap_dom_element(dom_element) for dom_element in dom_elements]
         )
 
-    def __init__(self, elements: [Element]):
+    def __init__(self, elements):
         self._elements = elements
-        self._classes = ClassesCollection(self)
-        self._style = StyleCollection(self)
 
     def __eq__(self, obj):
-        """Check for equality by comparing the underlying DOM elements."""
+        """
+        Check equality by comparing elements.
+        """
         return isinstance(obj, ElementCollection) and obj._elements == self._elements
 
     def __getitem__(self, key):
-        """Get an item in the collection.
+        """
+        Get items from the collection.
 
-        If `key` is an integer or a slice we use it to index/slice the collection.
-        Otherwise, we use `key` as a query selector.
+        Behaviour depends on the key type:
+
+        - Integer: returns the element at that index.
+        - Slice: returns a new collection with elements in that slice.
+        - String: looks up an element by id (with or without '#' prefix).
+
+        ```python
+        collection[0]          # First element.
+        collection[1:3]        # New collection with 2nd and 3rd elements.
+        collection["my-id"]    # Element with id="my-id" (or None).
+        collection["#my-id"]   # Same as above (# is optional).
+        ```
         """
         if isinstance(key, int):
             return self._elements[key]
-
         if isinstance(key, slice):
             return ElementCollection(self._elements[key])
-
-        return self.find(key)
+        if isinstance(key, str):
+            for element in self._elements:
+                result = _find_by_id(element._dom_element, key)
+                if result:
+                    return result
+            return None
+        raise TypeError(
+            f"Collection indices must be integers, slices, or strings, "
+            f"not {type(key).__name__}"
+        )
 
     def __iter__(self):
         yield from self._elements
@@ -621,621 +1113,327 @@ class ElementCollection:
             f"{self._elements}"
         )
 
-    def __getattr__(self, name):
-        return [getattr(element, name) for element in self._elements]
-
-    def __setattr__(self, name, value):
-        # This class overrides `__setattr__` to delegate "public" attributes to the
-        # elements in the collection. BUT, we don't use the usual Python pattern where
-        # we set attributes on the collection itself via `self.__dict__` as that is not
-        # yet supported in our build of MicroPython. Instead, we handle it here by
-        # using super for all "private" attributes (those starting with an underscore).
-        if name.startswith("_"):
-            super().__setattr__(name, value)
-
-        else:
-            for element in self._elements:
-                setattr(element, name, value)
-
-    @property
-    def classes(self):
-        """Return the classes of the elements in the collection as a `ClassesCollection`."""
-        return self._classes
-
     @property
     def elements(self):
-        """Return the elements in the collection as a list."""
+        """
+        Return the underlying `list` of elements.
+        """
         return self._elements
 
-    @property
-    def style(self):
-        """"""
-        return self._style
-
     def find(self, selector):
-        """Find all elements that match the specified selector.
+        """
+        Find all descendants matching the
+        [CSS `selector`](https://developer.mozilla.org/en-US/docs/Web/CSS/Guides/Selectors).
 
-        Return the results as a (possibly empty) `ElementCollection`.
+        Searches within all elements in the collection.
+
+        ```python
+        collection.find("div")           # All div descendants.
+        collection.find(".my-class")     # All elements with class.
+        collection.find("#my-id")        # Element with id (as collection).
+        ```
         """
         elements = []
         for element in self._elements:
-            elements.extend(element.find(selector))
-
+            elements.extend(_find_and_wrap(element._dom_element, selector))
         return ElementCollection(elements)
 
+    def update_all(self, **kwargs):
+        """
+        Explicitly update all elements with the given attributes.
 
-# Classes for every HTML element. If the element tag name (e.g. "input") clashes with
-# either a Python keyword or common symbol, then we suffix the class name with an "_"
-# (e.g. the class for the "input" element is "input_").
+        ```python
+        collection.update_all(innerHTML="Hello")
+        collection.update_all(className="active", title="Updated")
+        ```
+        """
+        for element in self._elements:
+            for name, value in kwargs.items():
+                setattr(element, name, value)
 
 
-class a(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/a"""
-
-
-class abbr(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/abbr"""
-
-
-class address(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/address"""
-
-
-class area(Element):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/area"""
-
-
-class article(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/article"""
-
-
-class aside(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/aside"""
-
-
-class audio(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/audio"""
-
-
-class b(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/b"""
-
-
-class base(Element):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/base"""
-
-
-class blockquote(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/blockquote"""
-
-
-class body(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/body"""
-
-
-class br(Element):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/br"""
-
-
-class button(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/button"""
+# Special elements with custom methods and mixins.
 
 
 class canvas(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/canvas"""
+    """
+    A bespoke
+    [HTML canvas element](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/canvas)
+    with Pythonic drawing and download capabilities.
+    """
 
-    def download(self, filename: str = "snapped.png"):
-        """Download the current element with the filename provided in input.
-
-        Inputs:
-            * filename (str): name of the file being downloaded
-
-        Output:
-            None
+    def download(self, filename="snapped.png"):
         """
-        download_link = a(download=filename, href=self._dom_element.toDataURL())
+        Download the canvas content as an image file.
 
-        # Adding the link to the DOM is recommended for browser compatibility to make
-        # sure that the click works.
+        Creates a temporary download link and triggers it.
+        """
+        # The `a` element class is dynamically created below.
+        download_link = a(  # noqa: F821
+            download=filename, href=self._dom_element.toDataURL()
+        )
         self.append(download_link)
-
         download_link._dom_element.click()
 
     def draw(self, what, width=None, height=None):
-        """Draw `what` on the current element
+        """
+        Draw a 2d image source (`what`) onto the canvas. Optionally scale to
+        `width` and `height`.
 
-        Inputs:
-
-            * what (canvas image source): An element to draw into the context. The
-                specification permits any canvas image source, specifically, an
-                HTMLImageElement, an SVGImageElement, an HTMLVideoElement,
-                an HTMLCanvasElement, an ImageBitmap, an OffscreenCanvas, or a
-                VideoFrame.
+        Accepts canvas image sources: `HTMLImageElement`, `SVGImageElement`,
+        `HTMLVideoElement`, `HTMLCanvasElement`, `ImageBitmap`,
+        `OffscreenCanvas`, or `VideoFrame`.
         """
         if isinstance(what, Element):
             what = what._dom_element
 
-        # https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D/drawImage
         ctx = self._dom_element.getContext("2d")
         if width or height:
             ctx.drawImage(what, 0, 0, width, height)
-
         else:
             ctx.drawImage(what, 0, 0)
 
 
-class caption(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/caption"""
-
-
-class cite(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/cite"""
-
-
-class code(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/code"""
-
-
-class col(Element):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/col"""
-
-
-class colgroup(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/colgroup"""
-
-
-class data(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/data"""
-
-
-class datalist(ContainerElement, HasOptions):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/datalist"""
-
-
-class dd(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/dd"""
-
-
-class del_(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/del"""
-
-
-class details(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/details"""
-
-
-class dialog(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/dialog"""
-
-
-class div(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/div"""
-
-
-class dl(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/dl"""
-
-
-class dt(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/dt"""
-
-
-class em(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/em"""
-
-
-class embed(Element):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/embed"""
-
-
-class fieldset(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/fieldset"""
-
-
-class figcaption(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/figcaption"""
-
-
-class figure(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/figure"""
-
-
-class footer(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/footer"""
-
-
-class form(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/form"""
-
-
-class h1(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/h1"""
-
-
-class h2(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/h2"""
-
-
-class h3(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/h3"""
-
-
-class h4(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/h4"""
-
-
-class h5(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/h5"""
-
-
-class h6(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/h6"""
-
-
-class head(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/head"""
-
-
-class header(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/header"""
-
-
-class hgroup(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/hgroup"""
-
-
-class hr(Element):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/hr"""
-
-
-class html(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/html"""
-
-
-class i(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/i"""
-
-
-class iframe(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/iframe"""
-
-
-class img(Element):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/img"""
-
-
-class input_(Element):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input"""
-
-
-class ins(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/ins"""
-
-
-class kbd(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/kbd"""
-
-
-class label(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/label"""
-
-
-class legend(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/legend"""
-
-
-class li(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/li"""
-
-
-class link(Element):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/link"""
-
-
-class main(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/main"""
-
-
-class map_(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/map"""
-
-
-class mark(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/mark"""
-
-
-class menu(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/menu"""
-
-
-class meta(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/meta"""
-
-
-class meter(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/meter"""
-
-
-class nav(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/nav"""
-
-
-class object_(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/object"""
-
-
-class ol(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/ol"""
-
-
-class optgroup(ContainerElement, HasOptions):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/optgroup"""
-
-
-class option(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/option"""
-
-
-class output(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/output"""
-
-
-class p(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/p"""
-
-
-class param(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/param"""
-
-
-class picture(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/picture"""
-
-
-class pre(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/pre"""
-
-
-class progress(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/progress"""
-
-
-class q(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/q"""
-
-
-class s(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/s"""
-
-
-class script(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/script"""
-
-
-class section(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/section"""
-
-
-class select(ContainerElement, HasOptions):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/select"""
-
-
-class small(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/small"""
-
-
-class source(Element):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/source"""
-
-
-class span(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/span"""
-
-
-class strong(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/strong"""
-
-
-class style(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/style"""
-
-
-class sub(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/sub"""
-
-
-class summary(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/summary"""
-
-
-class sup(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/sup"""
-
-
-class table(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/table"""
-
-
-class tbody(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/tbody"""
-
-
-class td(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/td"""
-
-
-class template(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/template"""
-
-
-class textarea(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/textarea"""
-
-
-class tfoot(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/tfoot"""
-
-
-class th(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/th"""
-
-
-class thead(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/thead"""
-
-
-class time(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/time"""
-
-
-class title(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/title"""
-
-
-class tr(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/tr"""
-
-
-class track(Element):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/track"""
-
-
-class u(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/u"""
-
-
-class ul(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/ul"""
-
-
-class var(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/var"""
-
-
 class video(ContainerElement):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/video"""
+    """
+    A bespoke
+    [HTML video element](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/video)
+    with Pythonic snapshot capability (to render an image to a canvas).
+    """
 
-    def snap(
-        self,
-        to: Element | str = None,
-        width: int | None = None,
-        height: int | None = None,
-    ):
+    def snap(self, to=None, width=None, height=None):
         """
-        Capture a snapshot (i.e. a single frame) of a video to a canvas.
+        Capture a video frame `to` a canvas element. Optionally scale to
+        `width` and `height`.
 
-        Inputs:
-
-            * to: the canvas to save the video frame to (if None, one is created).
-            * width: width of the snapshot (defaults to the video width).
-            * height: height of the snapshot (defaults to the video height).
-
-        Output:
-            (Element) canvas element where the video frame snapshot was drawn into
+        If no canvas is provided, this will create one. The to parameter
+        can be a canvas Element, raw DOM canvas, or CSS selector string.
         """
-        width = width if width is not None else self.videoWidth
-        height = height if height is not None else self.videoHeight
-
+        width = width if width else self.videoWidth
+        height = height if height else self.videoHeight
         if is_none(to):
             to = canvas(width=width, height=height)
-
         elif isinstance(to, Element):
             if to.tag != "canvas":
-                msg = "Element to snap to must be a canvas."
-                raise TypeError(msg)
-
+                raise TypeError("Element to snap to must be a canvas.")
         elif getattr(to, "tagName", "") == "CANVAS":
             to = canvas(dom_element=to)
-
-        # If 'to' is a string, then assume it is a query selector.
         elif isinstance(to, str):
-            nodelist = document.querySelectorAll(to)  # NOQA
+            nodelist = document.querySelectorAll(to)
             if nodelist.length == 0:
-                msg = "No element with selector {to} to snap to."
-                raise TypeError(msg)
-
+                raise TypeError(f"No element with selector {to} to snap to.")
             if nodelist[0].tagName != "CANVAS":
-                msg = "Element to snap to must be a canvas."
-                raise TypeError(msg)
-
+                raise TypeError("Element to snap to must be a canvas.")
             to = canvas(dom_element=nodelist[0])
-
         to.draw(self, width, height)
-
         return to
 
 
-class wbr(Element):
-    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/wbr"""
+class datalist(ContainerElement, HasOptions):
+    """
+    HTML datalist element with options support.
+
+    Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/datalist
+    """
 
 
+class optgroup(ContainerElement, HasOptions):
+    """
+    HTML optgroup element with options support.
+
+    Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/optgroup
+    """
+
+
+class select(ContainerElement, HasOptions):
+    """
+    HTML select element with options support.
+
+    Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/select
+    """
+
+
+# Container elements that can have children.
+# Note: canvas, video, datalist, optgroup, and select are defined above
+# with special implementations due to the HasOptions mixin.
 # fmt: off
-ELEMENT_CLASSES = [
-    a, abbr, address, area, article, aside, audio,
-    b, base, blockquote, body, br, button,
-    canvas, caption, cite, code, col, colgroup,
-    data, datalist, dd, del_, details, dialog, div, dl, dt,
-    em, embed,
-    fieldset, figcaption, figure, footer, form,
-    h1, h2, h3, h4, h5, h6, head, header, hgroup, hr, html,
-    i, iframe, img, input_, ins,
-    kbd,
-    label, legend, li, link,
-    main, map_, mark, menu, meta, meter,
-    nav,
-    object_, ol, optgroup, option, output,
-    p, param, picture, pre, progress,
-    q,
-    s, script, section, select, small, source, span, strong, style, sub, summary, sup,
-    table, tbody, td, template, textarea, tfoot, th, thead, time, title, tr, track,
-    u, ul,
-    var, video,
-    wbr,
+CONTAINER_TAGS = [
+    "a", "abbr", "address", "article", "aside", "audio",
+    "b", "blockquote", "body", "button",
+    "caption", "cite", "code", "colgroup",
+    "data", "dd", "del", "details", "dialog", "div", "dl", "dt",
+    "em",
+    "fieldset", "figcaption", "figure", "footer", "form",
+    "h1", "h2", "h3", "h4", "h5", "h6", "head", "header", "hgroup", "html",
+    "i", "iframe", "ins",
+    "kbd",
+    "label", "legend", "li",
+    "main", "map", "mark", "menu", "meta", "meter",
+    "nav",
+    "object", "ol", "option", "output",
+    "p", "param", "picture", "pre", "progress",
+    "q",
+    "s", "script", "section", "small", "span", "strong", "style",
+    "sub", "summary", "sup",
+    "table", "tbody", "td", "template", "textarea", "tfoot", "th", "thead",
+    "time", "title", "tr",
+    "u", "ul",
+    "var",
+    "wbr",
 ]
+"""
+Container elements that can have children. Each becomes a class in the
+`pyscript.web` namespace and corresponds to an HTML tag.
+"""
 # fmt: on
 
+# Void elements that cannot have children.
+VOID_TAGS = [
+    "area",
+    "base",
+    "br",
+    "col",
+    "embed",
+    "hr",
+    "img",
+    "input",
+    "link",
+    "source",
+    "track",
+]
+"""
+Void elements that cannot have children. Each becomes a class in the
+`pyscript.web` namespace and corresponds to an HTML tag.
+"""
 
-# Register all the default (aka "built-in") Element classes.
-Element.register_element_classes(ELEMENT_CLASSES)
+
+def _create_element_classes():
+    """
+    Create element classes dynamically and register them.
+
+    Generates classes for all standard HTML elements, using the appropriate
+    base class (ContainerElement or Element) for each tag.
+    """
+    # The existing special element classes defined above.
+    classes = [canvas, video, datalist, optgroup, select]
+    for tag in CONTAINER_TAGS:
+        # Tags that clash with Python keywords get a trailing underscore.
+        class_name = f"{tag}_" if tag in ("del", "map", "object") else tag
+        doc = (
+            f"HTML <{tag}> element. "
+            f"Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/"
+            f"Element/{tag}"
+        )
+        cls = type(class_name, (ContainerElement,), {"__doc__": doc})
+        globals()[class_name] = cls
+        classes.append(cls)
+    for tag in VOID_TAGS:
+        class_name = f"{tag}_" if tag == "input" else tag
+        doc = (
+            f"HTML <{tag}> element. "
+            f"Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/"
+            f"Element/{tag}"
+        )
+        cls = type(class_name, (Element,), {"__doc__": doc})
+        globals()[class_name] = cls
+        classes.append(cls)
+    Element.register_element_classes(classes)
+
+
+# Initialize element classes at module load time. :-)
+_create_element_classes()
 
 
 class Page:
-    """Represents the whole page."""
+    """
+    Represents the current web page.
+
+    Provides access to the document's `html`, `head`, and `body` elements,
+    plus convenience methods for finding elements and appending to the body.
+
+    ```python
+    from pyscript import web
+
+
+    # Access page structure.
+    web.page.html  # The <html> element.
+    web.page.head  # The <head> element.
+    web.page.body  # The <body> element.
+
+    # Get and set page title.
+    web.page.title = "New Title"
+    print(web.page.title)
+
+    # Find elements by CSS selector.
+    divs = web.page.find("div")
+    items = web.page.find(".item-class")
+
+    # Look up element by id.
+    element = web.page["my-id"]
+    element = web.page["#my-id"]  # The "#" prefix is optional.
+
+    # Append to the body (shortcut for page.body.append).
+    web.page.append(web.div("Hello"))
+    ```
+    """
 
     def __init__(self):
         self.html = Element.wrap_dom_element(document.documentElement)
         self.body = Element.wrap_dom_element(document.body)
         self.head = Element.wrap_dom_element(document.head)
 
-    def __getitem__(self, selector):
-        """Get an item on the page.
-
-        We don't index/slice the page like we do with `Element` and `ElementCollection`
-        as it is a bit muddier what the ideal behavior should be. Instead, we simply
-        use this as a convenience method to `find` elements on the page.
+    def __getitem__(self, key):
         """
-        return self.find(selector)
+        Look up an element by id.
+
+        The '#' prefix is optional and will be stripped if present.
+        Returns None if no element with that id exists.
+
+        ```python
+        page["my-id"]      # Element with id="my-id" (or None)
+        page["#my-id"]     # Same as above (# is optional)
+        ```
+        """
+        return _find_by_id(document, key)
 
     @property
     def title(self):
-        """Return the page title."""
+        """
+        Get the page `title`.
+        """
         return document.title
 
     @title.setter
     def title(self, value):
-        """Set the page title."""
+        """
+        Set the page `title`.
+        """
         document.title = value
 
     def append(self, *items):
-        """Shortcut for `page.body.append`."""
+        """
+        Append items to the page `body`.
+
+        Shortcut for `page.body.append(*items)`.
+        """
         self.body.append(*items)
 
-    def find(self, selector):  # NOQA
-        """Find all elements that match the specified selector.
-
-        Return the results as a (possibly empty) `ElementCollection`.
+    def find(self, selector):
         """
-        return ElementCollection.wrap_dom_elements(document.querySelectorAll(selector))
+        Find all elements matching the
+        [CSS `selector`](https://developer.mozilla.org/en-US/docs/Web/CSS/Guides/Selectors).
+
+        Returns an `ElementCollection` of matching elements.
+
+        ```python
+        page.find("div")              # All divs on the page
+        page.find(".my-class")        # All elements with class
+        page.find("#my-id")           # Element with id (as collection)
+        page.find("div.my-class")     # All divs with class
+        ```
+        """
+        return _find_and_wrap(document, selector)
 
 
 page = Page()
+"""A reference to the current web page. An instance of the `Page` class."""
diff --git a/core/src/stdlib/pyscript/websocket.py b/core/src/stdlib/pyscript/websocket.py
index e49ab01a..da735d17 100644
--- a/core/src/stdlib/pyscript/websocket.py
+++ b/core/src/stdlib/pyscript/websocket.py
@@ -1,88 +1,295 @@
+"""
+This module provides a Pythonic wrapper around the browser's
+[WebSocket API](https://developer.mozilla.org/en-US/docs/Web/API/WebSocket),
+enabling two-way communication with WebSocket servers.
+
+Use this for real-time applications:
+
+- Pythonic interface to browser WebSockets.
+- Automatic handling of async event handlers.
+- Support for receiving text (`str`) and binary (`memoryview`) data.
+- Support for sending text (`str`) and binary (`bytes` and `bytearray`) data.
+- Compatible with Pyodide and MicroPython.
+- Works in webworker contexts.
+- Naming deliberately follows the JavaScript WebSocket API closely for
+  familiarity.
+
+See the Python docs for
+[an explanation of memoryview](https://docs.python.org/3/library/stdtypes.html#memoryview).
+
+
+```python
+from pyscript import WebSocket
+
+
+def on_open(event):
+    print("Connected!")
+    ws.send("Hello server")
+
+def on_message(event):
+    print(f"Received: {event.data}")
+
+def on_close(event):
+    print("Connection closed")
+
+ws = WebSocket(url="ws://localhost:8080/")
+ws.onopen = on_open
+ws.onmessage = on_message
+ws.onclose = on_close
+```
+"""
+
 import js
 from pyscript.ffi import create_proxy
 from pyscript.util import as_bytearray, is_awaitable
 
-code = "code"
-protocols = "protocols"
-reason = "reason"
-methods = ["onclose", "onerror", "onmessage", "onopen"]
 
+def _attach_event_handler(websocket, handler_name, handler_function):
+    """
+    Given a `websocket`, and `handler_name`, attach the `handler_function`
+    to the `WebSocket` instance, handling both synchronous and asynchronous
+    handler functions.
 
-def add_listener(socket, onevent, listener):
-    p = create_proxy(listener)
+    Creates a JavaScript proxy for the handler and wraps async handlers
+    appropriately. Handles the `WebSocketEvent` wrapping for all handlers.
+    """
+    if is_awaitable(handler_function):
 
-    if is_awaitable(listener):
-
-        async def wrapper(e):
-            await p(EventMessage(e))
-
-        m = wrapper
+        async def async_wrapper(event):
+            await handler_function(WebSocketEvent(event))
 
+        wrapped_handler = create_proxy(async_wrapper)
     else:
-        m = lambda e: p(EventMessage(e))
-
-    # Pyodide fails at setting socket[onevent] directly
-    setattr(socket, onevent, m)
+        wrapped_handler = create_proxy(
+            lambda event: handler_function(WebSocketEvent(event))
+        )
+    # Note: Direct assignment (websocket[handler_name]) fails in Pyodide.
+    setattr(websocket, handler_name, wrapped_handler)
 
 
-class EventMessage:
+class WebSocketEvent:
+    """
+    A read-only wrapper for
+    [WebSocket event objects](https://developer.mozilla.org/en-US/docs/Web/API/MessageEvent).
+
+    This class wraps browser WebSocket events and provides convenient access
+    to event properties. It handles the conversion of binary data from
+    JavaScript typed arrays to Python bytes-like objects.
+
+    The most commonly used property is `event.data`, which contains the
+    message data for "message" events.
+
+    ```python
+    def on_message(event):  # The event is a WebSocketEvent instance.
+        # For text messages.
+        if isinstance(event.data, str):
+            print(f"Text: {event.data}")
+        else:
+            # For binary messages.
+            print(f"Binary: {len(event.data)} bytes")
+    ```
+    """
+
     def __init__(self, event):
+        """
+        Create a WebSocketEvent wrapper from an underlying JavaScript
+        `event`.
+        """
         self._event = event
 
     def __getattr__(self, attr):
-        value = getattr(self._event, attr)
+        """
+        Get an attribute `attr` from the underlying event object.
 
+        Handles special conversion of binary data from JavaScript typed
+        arrays to Python `memoryview` objects.
+        """
+        value = getattr(self._event, attr)
         if attr == "data" and not isinstance(value, str):
             if hasattr(value, "to_py"):
+                # Pyodide - convert JavaScript typed array to Python.
                 return value.to_py()
-            # shims in MicroPython
-            return memoryview(as_bytearray(value))
-
+            else:
+                # MicroPython - manually convert JS ArrayBuffer.
+                return memoryview(as_bytearray(value))
         return value
 
 
 class WebSocket:
+    """
+    This class provides a Python-friendly interface to WebSocket connections,
+    handling communication with WebSocket servers. It supports both text and
+    binary data transmission.
+
+    Access the underlying WebSocket methods and properties directly if needed.
+    However, the wrapper provides a more Pythonic API. If you need to work
+    with the raw JavaScript WebSocket instance, you can access it via the
+    `_js_websocket` attribute.
+
+    Using textual (`str`) data:
+
+    ```python
+    from pyscript import WebSocket
+
+
+    # Create WebSocket with handlers as arguments.
+    def handle_message(event):
+        print(f"Got: {event.data}")
+
+    ws = WebSocket(
+        url="ws://echo.websocket.org/",
+        onmessage=handle_message
+    )
+
+    # Or assign handlers after creation.
+    def handle_open(event):
+        ws.send("Hello!")
+
+    ws.onopen = handle_open
+    ```
+
+    Using binary (`memoryview`) data:
+
+    ```python
+    def handle_message(event):
+        if isinstance(event.data, str):
+            print(f"Text: {event.data}")
+        else:
+            # Binary data as memoryview.
+            print(f"Binary: {len(event.data)} bytes")
+
+    ws = WebSocket(url="ws://example.com/", onmessage=handle_message)
+
+    # Send binary data.
+    data = bytearray([0x01, 0x02, 0x03])
+    ws.send(data)
+    ```
+
+    Read more about Python's
+    [`memoryview` here](https://docs.python.org/3/library/stdtypes.html#memoryview).
+    """
+
+    # WebSocket ready state constants.
     CONNECTING = 0
     OPEN = 1
     CLOSING = 2
     CLOSED = 3
 
-    def __init__(self, **kw):
-        url = kw["url"]
-        if protocols in kw:
-            socket = js.WebSocket.new(url, kw[protocols])
+    def __init__(self, url, protocols=None, **handlers):
+        """
+        Create a new WebSocket connection from the given `url` (`ws://` or
+        `wss://`). Optionally specify `protocols` (a string or a list of
+        protocol strings) and event handlers (`onopen`, `onmessage`, etc.) as
+        keyword arguments.
+
+        These arguments and naming conventions mirror those of the
+        [underlying JavaScript WebSocket API](https://developer.mozilla.org/en-US/docs/Web/API/WebSocket)
+        for familiarity.
+
+        If you need access to the underlying JavaScript WebSocket instance,
+        you can get it via the `_js_websocket` attribute.
+
+        ```python
+        # Basic connection.
+        ws = WebSocket(url="ws://localhost:8080/")
+
+        # With protocol.
+        ws = WebSocket(
+            url="wss://example.com/socket",
+            protocols="chat"
+        )
+
+        # With handlers.
+        ws = WebSocket(
+            url="ws://localhost:8080/",
+            onopen=lambda e: print("Connected"),
+            onmessage=lambda e: print(e.data)
+        )
+        ```
+        """
+        # Create underlying JavaScript WebSocket.
+        if protocols:
+            js_websocket = js.WebSocket.new(url, protocols)
         else:
-            socket = js.WebSocket.new(url)
-
-        socket.binaryType = "arraybuffer"
-        object.__setattr__(self, "_ws", socket)
-
-        for t in methods:
-            if t in kw:
-                add_listener(socket, t, kw[t])
+            js_websocket = js.WebSocket.new(url)
+        # Set binary type to arraybuffer for easier Python handling.
+        js_websocket.binaryType = "arraybuffer"
+        # Store the underlying WebSocket.
+        # Use object.__setattr__ to bypass our custom __setattr__.
+        object.__setattr__(self, "_js_websocket", js_websocket)
+        # Attach any event handlers passed as keyword arguments.
+        for handler_name, handler in handlers.items():
+            setattr(self, handler_name, handler)
 
     def __getattr__(self, attr):
-        return getattr(self._ws, attr)
+        """
+        Get an attribute `attr` from the underlying WebSocket.
+
+        This allows transparent access to WebSocket properties like
+        `readyState`, `url`, `bufferedAmount`, etc.
+        """
+        return getattr(self._js_websocket, attr)
 
     def __setattr__(self, attr, value):
-        if attr in methods:
-            add_listener(self._ws, attr, value)
-        else:
-            setattr(self._ws, attr, value)
+        """
+        Set an attribute `attr` on the WebSocket to the given `value`.
 
-    def close(self, **kw):
-        if code in kw and reason in kw:
-            self._ws.close(kw[code], kw[reason])
-        elif code in kw:
-            self._ws.close(kw[code])
+        Event handler attributes (`onopen`, `onmessage`, etc.) are specially
+        handled to create proper proxies. Other attributes are set on the
+        underlying WebSocket directly.
+        """
+        if attr in ["onclose", "onerror", "onmessage", "onopen"]:
+            _attach_event_handler(self._js_websocket, attr, value)
         else:
-            self._ws.close()
+            setattr(self._js_websocket, attr, value)
 
     def send(self, data):
+        """
+        Send `data` through the WebSocket.
+
+        Accepts both text (`str`) and binary data (`bytes`, `bytearray`, etc.).
+        Binary data is automatically converted to a JavaScript `Uint8Array`.
+
+        ```python
+        # Send text.
+        ws.send("Hello server!")
+
+        # Send binary.
+        ws.send(bytes([1, 2, 3, 4]))
+        ws.send(bytearray([5, 6, 7, 8]))
+        ```
+
+        !!! warning
+
+            The WebSocket **must be in the OPEN state to send data**.
+        """
         if isinstance(data, str):
-            self._ws.send(data)
+            self._js_websocket.send(data)
         else:
             buffer = js.Uint8Array.new(len(data))
-            for pos, b in enumerate(data):
-                buffer[pos] = b
-            self._ws.send(buffer)
+            for index, byte_value in enumerate(data):
+                buffer[index] = byte_value
+            self._js_websocket.send(buffer)
+
+    def close(self, code=None, reason=None):
+        """
+        Close the WebSocket connection. Optionally specify a `code` (`int`)
+        and a `reason` (`str`) for closing the connection.
+
+        ```python
+        # Normal close.
+        ws.close()
+
+        # Close with code and reason.
+        ws.close(code=1000, reason="Task completed")
+        ```
+
+        Usage and values for `code` and `reasons`
+        [are explained here](https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/close).
+        """
+        if code and reason:
+            self._js_websocket.close(code, reason)
+        elif code:
+            self._js_websocket.close(code)
+        else:
+            self._js_websocket.close()
diff --git a/core/src/stdlib/pyscript/workers.py b/core/src/stdlib/pyscript/workers.py
index 9a214d5e..bdaf29b5 100644
--- a/core/src/stdlib/pyscript/workers.py
+++ b/core/src/stdlib/pyscript/workers.py
@@ -1,45 +1,194 @@
-import js as _js
-from polyscript import workers as _workers
+"""
+This module provides access to named
+[web workers](https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API)
+defined in `<script>` tags, and utilities for dynamically creating workers
+from Python code.
 
-_get = _js.Reflect.get
+Named workers are Python web workers defined in HTML with a `name` attribute
+that can be referenced from the main thread or other workers. This module
+provides the `workers` object for accessing named workers and the
+`create_named_worker()` function for dynamically creating them.
+
+Accessing named workers:
+
+```html
+<!-- Define a named worker -->
+<script type="py" worker name="calculator">
+def add(a, b):
+    return a + b
+
+__export__ = ["add"]
+</script>
+
+<!-- Access from main thread -->
+<script type="mpy">
+from pyscript import workers
 
 
-def _set(script, name, value=""):
-    script.setAttribute(name, value)
+calc = await workers["calculator"]
+result = await calc.add(5, 3)
+print(result)  # 8
+</script>
+```
+
+Dynamically creating named workers:
+
+```python
+from pyscript import create_named_worker
 
 
-# this solves an inconsistency between Pyodide and MicroPython
-# @see https://github.com/pyscript/pyscript/issues/2106
-class _ReadOnlyProxy:
+# Create a worker from a Python file.
+worker = await create_named_worker(
+    src="./background_tasks.py",
+    name="task-processor"
+)
+
+# Use the worker's exported functions.
+result = await worker.process_data([1, 2, 3, 4, 5])
+print(result)
+```
+
+Key features:
+- Access (`await`) named workers via dictionary-like syntax.
+- Dynamically create workers from Python.
+- Cross-interpreter support (Pyodide and MicroPython).
+
+Worker access is asynchronous - you must `await workers[name]` to get
+a reference to the worker. This is because workers may not be ready
+immediately at startup.
+"""
+
+import js
+import json
+from polyscript import workers as _polyscript_workers
+
+
+class _ReadOnlyWorkersProxy:
+    """
+    A read-only proxy for accessing named web workers. Use
+    `create_named_worker()` to create new workers found in this proxy.
+
+    This provides dictionary-like access to named workers defined in
+    the page. It handles differences between Pyodide and MicroPython
+    implementations transparently.
+
+    (See: https://github.com/pyscript/pyscript/issues/2106 for context.)
+
+    The proxy is read-only to prevent accidental modification of the
+    underlying workers registry. Both item access and attribute access are
+    supported for convenience (especially since HTML attribute names may
+    not be valid Python identifiers).
+
+    ```python
+    from pyscript import workers
+
+    # Access a named worker.
+    my_worker = await workers["worker-name"]
+    result = await my_worker.some_function()
+
+    # Alternatively, if the name works, access via attribute notation.
+    my_worker = await workers.worker_name
+    result = await my_worker.some_function()
+    ```
+
+    **This is a proxy object, not a dict**. You cannot iterate over it or
+    get a list of worker names. This is intentional because worker
+    startup timing is non-deterministic.
+    """
+
     def __getitem__(self, name):
-        return _get(_workers, name)
+        """
+        Get a named worker by `name`. It returns a promise that resolves to
+        the worker reference when ready.
+
+        This is useful if the underlying worker name is not a valid Python
+        identifier.
+
+        ```python
+        worker = await workers["my-worker"]
+        ```
+        """
+        return js.Reflect.get(_polyscript_workers, name)
 
     def __getattr__(self, name):
-        return _get(_workers, name)
+        """
+        Get a named worker as an attribute. It returns a promise that resolves
+        to the worker reference when ready.
+
+        This allows accessing workers via dot notation as an alternative
+        to bracket notation.
+
+        ```python
+        worker = await workers.my_worker
+        ```
+        """
+        return js.Reflect.get(_polyscript_workers, name)
 
 
-workers = _ReadOnlyProxy()
+# Global workers proxy for accessing named workers.
+workers = _ReadOnlyWorkersProxy()
+"""Global proxy for accessing named web workers."""
 
 
-async def create_named_worker(src="", name="", config=None, type="py"):
-    from json import dumps
+async def create_named_worker(src, name, config=None, type="py"):
+    """
+    Dynamically create a web worker with a `src` Python file, a unique
+    `name` and optional `config` (dict or JSON string) and `type` (`py`
+    for Pyodide or `mpy` for MicroPython, the default is `py`).
 
-    if not src:
-        msg = "Named workers require src"
-        raise ValueError(msg)
+    This function creates a new web worker by injecting a `<script>` tag into
+    the document. The worker will be accessible via the `workers` proxy once
+    it's ready.
 
-    if not name:
-        msg = "Named workers require a name"
-        raise ValueError(msg)
+    It returns a promise that resolves to the worker reference when ready.
 
-    s = _js.document.createElement("script")
-    s.type = type
-    s.src = src
-    _set(s, "worker")
-    _set(s, "name", name)
+    ```python
+    from pyscript import create_named_worker
 
+
+    # Create a Pyodide worker.
+    worker = await create_named_worker(
+        src="./my_worker.py",
+        name="background-worker"
+    )
+
+    # Use the worker.
+    result = await worker.process_data()
+
+    # Create with standard PyScript configuration.
+    worker = await create_named_worker(
+        src="./processor.py",
+        name="data-processor",
+        config={"packages": ["numpy", "pandas"]}
+    )
+
+    # Use MicroPython instead.
+    worker = await create_named_worker(
+        src="./lightweight_worker.py",
+        name="micro-worker",
+        type="mpy"
+    )
+    ```
+
+    !!! info
+
+        **The worker script should define** `__export__` to specify which
+        functions or objects are accessible from the main thread.
+    """
+    # Create script element for the worker.
+    script = js.document.createElement("script")
+    script.type = type
+    script.src = src
+    # Mark as a worker with a name.
+    script.setAttribute("worker", "")
+    script.setAttribute("name", name)
+    # Add configuration if provided.
     if config:
-        _set(s, "config", (isinstance(config, str) and config) or dumps(config))
-
-    _js.document.body.append(s)
+        if isinstance(config, str):
+            config_str = config
+        else:
+            config_str = json.dumps(config)
+        script.setAttribute("config", config_str)
+    # Inject the script into the document and await the result.
+    js.document.body.append(script)
     return await workers[name]
diff --git a/core/tests/py_tests.main.spec.js b/core/tests/py_tests.main.spec.js
index 02a897ac..61bf14ee 100644
--- a/core/tests/py_tests.main.spec.js
+++ b/core/tests/py_tests.main.spec.js
@@ -1,6 +1,6 @@
 import { test, expect } from '@playwright/test';
 
-const timeout = 60 * 1000;
+const timeout = 120 * 1000;
 
 test.setTimeout(timeout);
 
diff --git a/core/tests/python/index.html b/core/tests/python/index.html
index f0ca7957..04d88f95 100644
--- a/core/tests/python/index.html
+++ b/core/tests/python/index.html
@@ -23,6 +23,8 @@
 
         <div id="div-no-classes"></div>
 
+        <script type="py" worker name="testworker" src="./worker_functions.py"></script>
+
         <div style="visibility: hidden;">
             <h2>Test Read and Write</h2>
             <div id="test_rr_div">Content test_rr_div</div>
@@ -63,6 +65,7 @@
             <button>I'm another button you can click</button>
             <button id="a-third-button">2 is better than 3 :)</button>
             <button id="another-test-button">I'm another button to be clicked</button>
+            <button id="button-for-event-testing">Button for event testing</button>
 
             <div id="element-append-tests"></div>
             <p class="collection"></p>
diff --git a/core/tests/python/settings_mpy.json b/core/tests/python/settings_mpy.json
index fb46cf3b..255f6f9c 100644
--- a/core/tests/python/settings_mpy.json
+++ b/core/tests/python/settings_mpy.json
@@ -1,27 +1,26 @@
 {
     "files": {
-        "https://raw.githubusercontent.com/ntoll/upytest/1.0.9/upytest.py": "",
+        "https://raw.githubusercontent.com/ntoll/upytest/1.0.11/upytest.py": "",
         "./tests/test_config.py": "tests/test_config.py",
+        "./tests/test_context.py": "tests/test_context.py",
         "./tests/test_current_target.py": "tests/test_current_target.py",
         "./tests/test_display.py": "tests/test_display.py",
         "./tests/test_document.py": "tests/test_document.py",
+        "./tests/test_events.py": "tests/test_events.py",
         "./tests/test_fetch.py": "tests/test_fetch.py",
         "./tests/test_ffi.py": "tests/test_ffi.py",
-        "./tests/test_js_modules.py": "tests/test_js_modules.py",
+        "./tests/test_fs.py": "tests/test_fs.py",
         "./tests/test_media.py": "tests/test_media.py",
         "./tests/test_storage.py": "tests/test_storage.py",
+        "./tests/test_util.py": "tests/test_util.py",
         "./tests/test_running_in_worker.py": "tests/test_running_in_worker.py",
         "./tests/test_web.py": "tests/test_web.py",
         "./tests/test_websocket.py": "tests/test_websocket.py",
-        "./tests/test_events.py": "tests/test_events.py",
-        "./tests/test_window.py": "tests/test_window.py"
+        "./tests/test_window.py": "tests/test_window.py",
+        "./tests/test_workers.py": "tests/test_workers.py"
     },
     "js_modules": {
-        "main": {
-            "./example_js_module.js": "greeting"
-        },
-        "worker": {
-            "./example_js_worker_module.js": "greeting_worker"
-        }
+        "main": {"./example_js_module.js": "greeting"},
+        "worker": {"./example_js_worker_module.js": "greeting_worker"}
     }
 }
diff --git a/core/tests/python/settings_py.json b/core/tests/python/settings_py.json
index 50086a8c..af3e03c6 100644
--- a/core/tests/python/settings_py.json
+++ b/core/tests/python/settings_py.json
@@ -1,29 +1,28 @@
 {
     "files": {
-        "https://raw.githubusercontent.com/ntoll/upytest/1.0.9/upytest.py": "",
+        "https://raw.githubusercontent.com/ntoll/upytest/1.0.11/upytest.py": "",
         "./tests/test_config.py": "tests/test_config.py",
+        "./tests/test_context.py": "tests/test_context.py",
         "./tests/test_current_target.py": "tests/test_current_target.py",
         "./tests/test_display.py": "tests/test_display.py",
         "./tests/test_document.py": "tests/test_document.py",
+        "./tests/test_events.py": "tests/test_events.py",
         "./tests/test_fetch.py": "tests/test_fetch.py",
         "./tests/test_ffi.py": "tests/test_ffi.py",
+        "./tests/test_fs.py": "tests/test_fs.py",
         "./tests/test_media.py": "tests/test_media.py",
-        "./tests/test_js_modules.py": "tests/test_js_modules.py",
         "./tests/test_storage.py": "tests/test_storage.py",
+        "./tests/test_util.py": "tests/test_util.py",
         "./tests/test_running_in_worker.py": "tests/test_running_in_worker.py",
         "./tests/test_web.py": "tests/test_web.py",
         "./tests/test_websocket.py": "tests/test_websocket.py",
-        "./tests/test_events.py": "tests/test_events.py",
-        "./tests/test_window.py": "tests/test_window.py"
+        "./tests/test_window.py": "tests/test_window.py",
+        "./tests/test_workers.py": "tests/test_workers.py"
     },
     "js_modules": {
-        "main": {
-            "./example_js_module.js": "greeting"
-        },
-        "worker": {
-            "./example_js_worker_module.js": "greeting_worker"
-        }
+        "main": {"./example_js_module.js": "greeting"},
+        "worker": {"./example_js_worker_module.js": "greeting_worker"}
     },
-    "packages": ["Pillow" ],
+    "packages": ["Pillow"],
     "experimental_ffi_timeout": 0
 }
diff --git a/core/tests/python/tests/test_js_modules.py b/core/tests/python/tests/test_context.py
similarity index 100%
rename from core/tests/python/tests/test_js_modules.py
rename to core/tests/python/tests/test_context.py
diff --git a/core/tests/python/tests/test_current_target.py b/core/tests/python/tests/test_current_target.py
index cc4e24d2..fa2daf61 100644
--- a/core/tests/python/tests/test_current_target.py
+++ b/core/tests/python/tests/test_current_target.py
@@ -13,7 +13,7 @@ def test_current_target():
     """
     expected = "py-0"
     if is_micropython:
-        expected = "mpy-w0-target" if RUNNING_IN_WORKER else "mpy-0"
+        expected = "mpy-w1-target" if RUNNING_IN_WORKER else "mpy-0"
     elif RUNNING_IN_WORKER:
-        expected = "py-w0-target"
+        expected = "py-w1-target"
     assert current_target() == expected, f"Expected {expected} got {current_target()}"
diff --git a/core/tests/python/tests/test_display.py b/core/tests/python/tests/test_display.py
index d891bf7c..ada84582 100644
--- a/core/tests/python/tests/test_display.py
+++ b/core/tests/python/tests/test_display.py
@@ -3,6 +3,7 @@ Tests for the display function in PyScript.
 """
 
 import asyncio
+import json
 
 import upytest
 from pyscript import HTML, RUNNING_IN_WORKER, display, py_import, web
@@ -107,20 +108,7 @@ def test_empty_string_target_raises_value_error():
     """
     with upytest.raises(ValueError) as exc:
         display("hello world", target="")
-    assert str(exc.exception) == "Cannot have an empty target"
-
-
-def test_non_string_target_values_raise_typerror():
-    """
-    The target parameter must be a string.
-    """
-    with upytest.raises(TypeError) as exc:
-        display("hello world", target=True)
-    assert str(exc.exception) == "target must be str or None, not bool"
-
-    with upytest.raises(TypeError) as exc:
-        display("hello world", target=123)
-    assert str(exc.exception) == "target must be str or None, not int"
+    assert str(exc.exception) == "Cannot find element with id='' in the page."
 
 
 async def test_tag_target_attribute():
@@ -286,4 +274,406 @@ async def test_image_renders_correctly():
     display(img, target="test-element-container", append=False)
     target = web.page.find("#test-element-container")[0]
     img = target.find("img")[0]
-    assert img.src.startswith("data:image/png;charset=utf-8;base64")
+    assert img.src.startswith("data:image/png;base64"), img.src
+
+
+async def test_mimebundle_simple():
+    """
+    An object with _repr_mimebundle_ should use the mimebundle formats.
+    """
+
+    class MimebundleObj:
+        def _repr_mimebundle_(self):
+            return {
+                "text/html": "<strong>Bold HTML</strong>",
+                "text/plain": "Plain text fallback",
+            }
+
+    display(MimebundleObj())
+    container = await get_display_container()
+    # Should prefer HTML from mimebundle.
+    assert container[0].innerHTML == "<strong>Bold HTML</strong>"
+
+
+async def test_mimebundle_with_metadata():
+    """
+    Mimebundle can include metadata for specific MIME types.
+    """
+
+    class ImageWithMeta:
+        def _repr_mimebundle_(self):
+            return (
+                {
+                    "image/png": "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNk+M9QDwADhgGAWjR9awAAAABJRU5ErkJggg=="
+                },
+                {"image/png": {"width": "100", "height": "50"}},
+            )
+
+    display(ImageWithMeta(), target="test-element-container", append=False)
+    target = web.page.find("#test-element-container")[0]
+    img = target.find("img")[0]
+    assert img.getAttribute("width") == "100"
+    assert img.getAttribute("height") == "50"
+
+
+async def test_mimebundle_with_tuple_output():
+    """
+    Mimebundle format values can be tuples with (data, metadata).
+    """
+
+    class TupleOutput:
+        def _repr_mimebundle_(self):
+            return {"text/html": ("<em>Italic</em>", {"custom": "meta"})}
+
+    display(TupleOutput())
+    container = await get_display_container()
+    assert container[0].innerHTML == "<em>Italic</em>"
+
+
+async def test_mimebundle_metadata_merge():
+    """
+    Format-specific metadata should merge with global metadata.
+    """
+
+    class MetaMerge:
+        def _repr_mimebundle_(self):
+            return (
+                {
+                    "image/png": (
+                        "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNk+M9QDwADhgGAWjR9awAAAABJRU5ErkJggg==",
+                        {"height": "75"},
+                    )
+                },
+                {"image/png": {"width": "100"}},
+            )
+
+    display(MetaMerge(), target="test-element-container", append=False)
+    target = web.page.find("#test-element-container")[0]
+    img = target.find("img")[0]
+    # Both global and format-specific metadata should be present.
+    assert img.getAttribute("width") == "100"
+    assert img.getAttribute("height") == "75"
+
+
+async def test_mimebundle_unsupported_mime():
+    """
+    If mimebundle contains only unsupported MIME types, fall back to regular methods.
+    """
+
+    class UnsupportedMime:
+        def _repr_mimebundle_(self):
+            return {"application/pdf": "PDF data", "text/latex": "LaTeX data"}
+
+        def _repr_html_(self):
+            return "<p>HTML fallback</p>"
+
+    display(UnsupportedMime())
+    container = await get_display_container()
+    # Should fall back to _repr_html_.
+    assert container[0].innerHTML == "<p>HTML fallback</p>"
+
+
+async def test_mimebundle_no_dict():
+    """
+    Mimebundle that returns just a dict (no tuple) should work.
+    """
+
+    class SimpleMimebundle:
+        def _repr_mimebundle_(self):
+            return {"text/html": "<code>Code</code>"}
+
+    display(SimpleMimebundle())
+    container = await get_display_container()
+    assert container[0].innerHTML == "<code>Code</code>"
+
+
+async def test_repr_html():
+    """
+    Objects with _repr_html_ should render as HTML.
+    """
+
+    class HTMLRepr:
+        def _repr_html_(self):
+            return "<h1>HTML Header</h1>"
+
+    display(HTMLRepr())
+    container = await get_display_container()
+    assert container[0].innerHTML == "<h1>HTML Header</h1>"
+
+
+async def test_repr_html_with_metadata():
+    """
+    _repr_html_ can return (html, metadata) tuple.
+    """
+
+    class HTMLWithMeta:
+        def _repr_html_(self):
+            return ("<p>Paragraph</p>", {"data-custom": "value"})
+
+    display(HTMLWithMeta())
+    container = await get_display_container()
+    # Metadata is not used in _repr_html_ rendering, but ensure HTML is
+    # correct.
+    assert container[0].innerHTML == "<p>Paragraph</p>"
+
+
+async def test_repr_svg():
+    """
+    Objects with _repr_svg_ should render as SVG.
+    """
+
+    class SVGRepr:
+        def _repr_svg_(self):
+            return '<svg width="100" height="100"><circle cx="50" cy="50" r="40" fill="blue"/></svg>'
+
+    display(SVGRepr(), target="test-element-container", append=False)
+    target = web.page.find("#test-element-container")[0]
+    assert "svg" in target.innerHTML.lower()
+    assert "circle" in target.innerHTML.lower()
+
+
+async def test_repr_json():
+    """
+    Objects with _repr_json_ should render as JSON.
+    """
+
+    class JSONRepr:
+        def _repr_json_(self):
+            return '{"key": "value", "number": 42}'
+
+    display(JSONRepr(), target="test-element-container", append=False)
+    target = web.page.find("#test-element-container")[0]
+    assert '"key": "value"' in target.innerHTML
+    value = json.loads(target.innerText)
+    assert value["key"] == "value"
+    assert value["number"] == 42
+
+
+async def test_repr_png_bytes():
+    """
+    _repr_png_ can render raw bytes.
+    """
+
+    class PNGBytes:
+        def _repr_png_(self):
+            # Valid 1x1 transparent PNG as bytes.
+            return b"\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x01\x00\x00\x00\x01\x08\x06\x00\x00\x00\x1f\x15\xc4\x89\x00\x00\x00\rIDATx\x9cc\x00\x01\x00\x00\x05\x00\x01\r\n-\xb4\x00\x00\x00\x00IEND\xaeB`\x82"
+
+    display(PNGBytes(), target="test-element-container", append=False)
+    target = web.page.find("#test-element-container")[0]
+    img = target.find("img")[0]
+    assert img.src.startswith("data:image/png;base64,")
+
+
+async def test_repr_png_base64():
+    """
+    _repr_png_ can render a base64-encoded string.
+    """
+
+    class PNGBase64:
+        def _repr_png_(self):
+            return "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNk+M9QDwADhgGAWjR9awAAAABJRU5ErkJggg=="
+
+    display(PNGBase64(), target="test-element-container", append=False)
+    target = web.page.find("#test-element-container")[0]
+    img = target.find("img")[0]
+    assert img.src.startswith("data:image/png;base64,")
+
+
+async def test_repr_jpeg():
+    """
+    Objects with _repr_jpeg_ should render as JPEG images.
+    """
+
+    class JPEGRepr:
+        def _repr_jpeg_(self):
+            # Minimal valid JPEG header (won't display but tests the path).
+            return b"\xff\xd8\xff\xe0\x00\x10JFIF"
+
+    display(JPEGRepr(), target="test-element-container", append=False)
+    target = web.page.find("#test-element-container")[0]
+    img = target.find("img")[0]
+    assert img.src.startswith("data:image/jpeg;base64,")
+
+
+async def test_repr_jpeg_base64():
+    """
+    _repr_jpeg_ can render a base64-encoded string.
+    """
+
+    class JPEGBase64:
+        def _repr_jpeg_(self):
+            return "ZCBqcGVnIG1pbmltdW0=="
+
+    display(JPEGBase64(), target="test-element-container", append=False)
+    target = web.page.find("#test-element-container")[0]
+    img = target.find("img")[0]
+    assert img.src.startswith("data:image/jpeg;base64,")
+
+
+async def test_object_with_no_repr_methods():
+    """
+    Objects with no representation methods should fall back to __repr__ with warning.
+    """
+
+    class NoReprMethods:
+        pass
+
+    obj = NoReprMethods()
+    display(obj)
+    container = await get_display_container()
+    # Should contain the default repr output - the class name. :-)
+    assert "NoReprMethods" in container.innerText
+
+
+async def test_repr_method_returns_none():
+    """
+    If a repr method exists but returns None, try next method.
+    """
+
+    class NoneReturner:
+        def _repr_html_(self):
+            return None
+
+        def __repr__(self):
+            return "Fallback repr"
+
+    display(NoneReturner())
+    container = await get_display_container()
+    assert container.innerText == "Fallback repr"
+
+
+async def test_multiple_repr_methods_priority():
+    """
+    When multiple repr methods exist, should use first available in priority order.
+    """
+
+    class MultipleReprs:
+        def _repr_html_(self):
+            # Highest priority.
+            return "<p>HTML version</p>"
+
+        def __repr__(self):
+            # Lower priority.
+            return "Text version"
+
+    display(MultipleReprs())
+    container = await get_display_container()
+    # Should use HTML, not repr.
+    assert container[0].innerHTML == "<p>HTML version</p>"
+
+
+async def test_empty_string_display():
+    """
+    Empty strings are ignored.
+    """
+    display("")
+    container = await get_display_container()
+    assert len(container.children) == 0
+
+
+async def test_newline_string_skipped():
+    """
+    Single newline strings are skipped (legacy behavior).
+    """
+    display("\n")
+    container = await get_display_container()
+    # Should be empty because newlines are skipped.
+    assert len(container.children) == 0
+
+
+async def test_string_with_special_html_chars():
+    """
+    Strings with HTML special characters should be escaped.
+    """
+    display("<script>alert('xss')</script>")
+    container = await get_display_container()
+    assert "&lt;script&gt;" in container[0].innerHTML
+    assert "<script>" not in container[0].innerHTML
+
+
+async def test_javascript_mime_type():
+    """
+    JavaScript MIME type should create script tags.
+    """
+
+    class JSRepr:
+        def _repr_javascript_(self):
+            return "console.log('test');"
+
+    display(JSRepr(), target="test-element-container", append=False)
+    target = web.page.find("#test-element-container")[0]
+    assert "<script>" in target.innerHTML
+    assert "console.log" in target.innerHTML
+
+
+async def test_append_false_clears_multiple_children():
+    """
+    append=False should clear all existing children, not just the last one.
+    """
+    # Add some initial content.
+    display("child 1")
+    display("child 2")
+    display("child 3")
+    container = await get_display_container()
+    assert len(container.children) == 3  # three divs.
+
+    # Now display with append=False.
+    display("new content", append=False)
+    container = await get_display_container()
+    # No divs used, just the new textual content.
+    assert container.innerText == "new content"
+
+
+async def test_mixed_append_true_false():
+    """
+    Mixing append=True and append=False should work correctly.
+    """
+    display("first", append=True)
+    display("second", append=True)
+    display("third", append=False)
+    container = await get_display_container()
+    assert container.innerText == "third"
+
+
+def test_target_with_multiple_hashes():
+    """
+    Target with multiple # characters should only strip the first one.
+
+    Such an id is not valid in HTML, but we should handle it gracefully.
+    """
+    # Should try to find element with id="#weird-id".
+    # This will raise ValueError as it doesn't exist.
+    with upytest.raises(ValueError):
+        display("content", target="##weird-id")
+
+
+async def test_display_none_value():
+    """
+    Displaying None should use its repr.
+    """
+    display(None)
+    container = await get_display_container()
+    assert container.innerText == "None"
+
+
+async def test_display_boolean_values():
+    """
+    Booleans should display as their repr.
+    """
+    display(True, False)
+    container = await get_display_container()
+    assert "True" in container.innerText
+    assert "False" in container.innerText
+
+
+async def test_display_numbers():
+    """
+    Numbers should display correctly.
+    """
+    display(42, 3.14159, -17)
+    container = await get_display_container()
+    text = container.innerText
+    assert "42" in text
+    assert "3.14159" in text
+    assert "-17" in text
diff --git a/core/tests/python/tests/test_events.py b/core/tests/python/tests/test_events.py
index 9f860bc9..85caa6ff 100644
--- a/core/tests/python/tests/test_events.py
+++ b/core/tests/python/tests/test_events.py
@@ -24,15 +24,26 @@ def teardown():
 
 def test_event_add_listener():
     """
-    Adding a listener to an event should add it to the list of listeners. It
-    should only be added once.
+    Adding a listener to an event should add it to the list of listeners.
+    It should only be added once.
     """
     event = Event()
     listener = lambda x: x
     event.add_listener(listener)
     event.add_listener(listener)
-    assert len(event._listeners) == 1  # Only one item added.
-    assert listener in event._listeners  # The item is the expected listener.
+    assert len(event._listeners) == 1
+    assert listener in event._listeners
+
+
+def test_event_add_non_callable_listener():
+    """
+    Adding a non-callable listener should raise a ValueError.
+    """
+    event = Event()
+    with upytest.raises(ValueError):
+        event.add_listener("not a callable")
+    with upytest.raises(ValueError):
+        event.add_listener(123)
 
 
 def test_event_remove_listener():
@@ -45,12 +56,25 @@ def test_event_remove_listener():
     listener2 = lambda x: x
     event.add_listener(listener1)
     event.add_listener(listener2)
-    assert len(event._listeners) == 2  # Two listeners added.
-    assert listener1 in event._listeners  # The first listener is in the list.
-    assert listener2 in event._listeners  # The second listener is in the list.
+    assert len(event._listeners) == 2
+    assert listener1 in event._listeners
+    assert listener2 in event._listeners
     event.remove_listener(listener1)
-    assert len(event._listeners) == 1  # Only one item remains.
-    assert listener2 in event._listeners  # The second listener is in the list.
+    assert len(event._listeners) == 1
+    assert listener2 in event._listeners
+
+
+def test_event_remove_nonexistent_listener():
+    """
+    Removing a listener that doesn't exist should be silently ignored.
+    """
+    event = Event()
+    listener1 = lambda x: x
+    listener2 = lambda x: x
+    event.add_listener(listener1)
+    event.remove_listener(listener2)
+    assert len(event._listeners) == 1
+    assert listener1 in event._listeners
 
 
 def test_event_remove_all_listeners():
@@ -62,15 +86,15 @@ def test_event_remove_all_listeners():
     listener2 = lambda x: x
     event.add_listener(listener1)
     event.add_listener(listener2)
-    assert len(event._listeners) == 2  # Two listeners added.
+    assert len(event._listeners) == 2
     event.remove_listener()
-    assert len(event._listeners) == 0  # No listeners remain.
+    assert len(event._listeners) == 0
 
 
 def test_event_trigger():
     """
     Triggering an event should call all of the listeners with the provided
-    arguments.
+    result.
     """
     event = Event()
     counter = 0
@@ -81,15 +105,45 @@ def test_event_trigger():
         assert x == "ok"
 
     event.add_listener(listener)
-    assert counter == 0  # The listener has not been triggered yet.
+    assert counter == 0
     event.trigger("ok")
-    assert counter == 1  # The listener has been triggered with the expected result.
+    assert counter == 1
+
+
+def test_event_trigger_no_listeners():
+    """
+    Triggering an event with no listeners should not raise an error.
+    """
+    event = Event()
+    event.trigger("test")
+
+
+def test_event_trigger_multiple_listeners():
+    """
+    Triggering an event should call all registered listeners.
+    """
+    event = Event()
+    results = []
+
+    def listener1(x):
+        results.append(f"listener1: {x}")
+
+    def listener2(x):
+        results.append(f"listener2: {x}")
+
+    event.add_listener(listener1)
+    event.add_listener(listener2)
+    event.trigger("test")
+
+    assert len(results) == 2
+    assert "listener1: test" in results
+    assert "listener2: test" in results
 
 
 async def test_event_trigger_with_awaitable():
     """
     Triggering an event with an awaitable listener should call the listener
-    with the provided arguments.
+    with the provided result.
     """
     call_flag = asyncio.Event()
     event = Event()
@@ -102,16 +156,119 @@ async def test_event_trigger_with_awaitable():
         call_flag.set()
 
     event.add_listener(listener)
-    assert counter == 0  # The listener has not been triggered yet.
+    assert counter == 0
     event.trigger("ok")
     await call_flag.wait()
-    assert counter == 1  # The listener has been triggered with the expected result.
+    assert counter == 1
+
+
+async def test_event_trigger_mixed_listeners():
+    """
+    Triggering an event with both sync and async listeners should work.
+    """
+    event = Event()
+    sync_called = False
+    async_flag = asyncio.Event()
+
+    def sync_listener(x):
+        nonlocal sync_called
+        sync_called = True
+        assert x == "mixed"
+
+    async def async_listener(x):
+        assert x == "mixed"
+        async_flag.set()
+
+    event.add_listener(sync_listener)
+    event.add_listener(async_listener)
+    event.trigger("mixed")
+
+    assert sync_called
+    await async_flag.wait()
+
+
+def test_event_listener_exception():
+    """
+    If a listener raises an exception, it should propagate and not be
+    silently ignored.
+    """
+    event = Event()
+
+    def bad_listener(x):
+        raise RuntimeError("Listener error")
+
+    event.add_listener(bad_listener)
+
+    with upytest.raises(RuntimeError):
+        event.trigger("test")
+
+
+def test_event_listener_exception_stops_other_listeners():
+    """
+    If a listener raises an exception, subsequent listeners should not be
+    called. There's a problem with the user's code that needs to be addressed!
+    """
+    event = Event()
+    called = []
+
+    def listener1(x):
+        called.append("listener1")
+
+    def bad_listener(x):
+        called.append("bad_listener")
+        raise RuntimeError("Listener error")
+
+    def listener3(x):
+        called.append("listener3")
+
+    event.add_listener(listener1)
+    event.add_listener(bad_listener)
+    event.add_listener(listener3)
+
+    with upytest.raises(RuntimeError):
+        event.trigger("test")
+
+    assert "listener1" in called
+    assert "bad_listener" in called
+    assert "listener3" not in called
+
+
+async def test_event_async_listener_exception():
+    """
+    If an async listener raises an exception, it cannot prevent other
+    listeners from being called, as async listeners run as tasks. This
+    is different behavior from sync listeners, but the simplest model
+    for users to understand.
+
+    This test ensures that even if one async listener fails, others
+    still run as per this expected behaviour. In MicroPython, the
+    exception will be reported to the user.
+    """
+    event = Event()
+    call_flag = asyncio.Event()
+    called = []
+
+    async def bad_listener(x):
+        called.append("bad_listener")
+        raise RuntimeError("Async listener error")
+
+    async def good_listener(x):
+        called.append("good_listener")
+        call_flag.set()
+
+    event.add_listener(bad_listener)
+    event.add_listener(good_listener)
+    event.trigger("test")
+
+    await call_flag.wait()
+    assert "bad_listener" in called
+    assert "good_listener" in called
 
 
 async def test_when_decorator_with_event():
     """
-    When the decorated function takes a single parameter,
-    it should be passed the event object.
+    When the decorated function takes a single parameter, it should be
+    passed the event object.
     """
     btn = web.button("foo_button", id="foo_id")
     container = get_container()
@@ -133,8 +290,8 @@ async def test_when_decorator_with_event():
 
 async def test_when_decorator_without_event():
     """
-    When the decorated function takes no parameters (not including 'self'),
-    it should be called without the event object.
+    When the decorated function takes no parameters, it should be called
+    without the event object.
     """
     btn = web.button("foo_button", id="foo_id")
     container = get_container()
@@ -143,7 +300,7 @@ async def test_when_decorator_without_event():
     called = False
     call_flag = asyncio.Event()
 
-    @web.when("click", selector="#foo_id")
+    @when("click", selector="#foo_id")
     def foo():
         nonlocal called
         called = True
@@ -156,8 +313,8 @@ async def test_when_decorator_without_event():
 
 async def test_when_decorator_with_event_as_async_handler():
     """
-    When the decorated function takes a single parameter,
-    it should be passed the event object. Async version.
+    When the decorated function takes a single parameter, it should be
+    passed the event object. Async version.
     """
     btn = web.button("foo_button", id="foo_id")
     container = get_container()
@@ -179,8 +336,8 @@ async def test_when_decorator_with_event_as_async_handler():
 
 async def test_when_decorator_without_event_as_async_handler():
     """
-    When the decorated function takes no parameters (not including 'self'),
-    it should be called without the event object. Async version.
+    When the decorated function takes no parameters, it should be called
+    without the event object. Async version.
     """
     btn = web.button("foo_button", id="foo_id")
     container = get_container()
@@ -189,7 +346,7 @@ async def test_when_decorator_without_event_as_async_handler():
     called = False
     call_flag = asyncio.Event()
 
-    @web.when("click", selector="#foo_id")
+    @when("click", selector="#foo_id")
     async def foo():
         nonlocal called
         called = True
@@ -202,7 +359,7 @@ async def test_when_decorator_without_event_as_async_handler():
 
 async def test_two_when_decorators():
     """
-    When decorating a function twice, both should function
+    When decorating a function twice, both should function independently.
     """
     btn = web.button("foo_button", id="foo_id")
     container = get_container()
@@ -235,7 +392,7 @@ async def test_two_when_decorators():
 async def test_when_decorator_multiple_elements():
     """
     The @when decorator's selector should successfully select multiple
-    DOM elements
+    DOM elements.
     """
     btn1 = web.button(
         "foo_button1",
@@ -283,7 +440,8 @@ async def test_when_decorator_multiple_elements():
 )
 def test_when_decorator_invalid_selector():
     """
-    When the selector parameter of @when is invalid, it should raise an error.
+    When the selector parameter of @when is invalid, it should raise an
+    error.
     """
     if upytest.is_micropython:
         from jsffi import JsException
@@ -298,139 +456,320 @@ def test_when_decorator_invalid_selector():
     assert "'#.bad' is not a valid selector" in str(e.exception), str(e.exception)
 
 
+def test_when_missing_selector_for_dom_event():
+    """
+    When using @when with a DOM event but no selector, should raise
+    ValueError.
+    """
+    with upytest.raises(ValueError):
+
+        @when("click")
+        def handler(event):
+            pass
+
+
+def test_when_empty_selector_finds_no_elements():
+    """
+    When selector matches no elements, should raise ValueError.
+    """
+    with upytest.raises(ValueError):
+
+        @when("click", "#nonexistent-element-id-12345")
+        def handler(event):
+            pass
+
+
 def test_when_decorates_an_event():
     """
-    When the @when decorator is used on a function to handle an Event instance,
-    the function should be called when the Event object is triggered.
+    When the @when decorator is used on a function to handle an Event
+    instance, the function should be called when the Event object is
+    triggered.
     """
-
     whenable = Event()
     counter = 0
 
-    # When as a decorator.
     @when(whenable)
     def handler(result):
         """
-        A function that should be called when the whenable object is triggered.
-
-        The result generated by the whenable object should be passed to the
-        function.
+        A function that should be called when the whenable object is
+        triggered.
         """
         nonlocal counter
         counter += 1
         assert result == "ok"
 
-    # The function should not be called until the whenable object is triggered.
     assert counter == 0
-    # Trigger the whenable object.
     whenable.trigger("ok")
-    # The function should have been called when the whenable object was
-    # triggered.
     assert counter == 1
 
 
-def test_when_called_with_an_event_and_handler():
+async def test_when_with_list_of_events():
     """
-    The when function should be able to be called with an Event object,
-    and a handler function.
+    The @when decorator should handle a list of Event objects.
     """
-    whenable = Event()
+    event1 = Event()
+    event2 = Event()
     counter = 0
 
+    @when([event1, event2])
     def handler(result):
-        """
-        A function that should be called when the whenable object is triggered.
-
-        The result generated by the whenable object should be passed to the
-        function.
-        """
         nonlocal counter
         counter += 1
-        assert result == "ok"
 
-    # When as a function.
-    when(whenable, handler)
-
-    # The function should not be called until the whenable object is triggered.
     assert counter == 0
-    # Trigger the whenable object.
-    whenable.trigger("ok")
-    # The function should have been called when the whenable object was
-    # triggered.
+    event1.trigger("test1")
+    assert counter == 1
+    event2.trigger("test2")
+    assert counter == 2
+
+
+async def test_when_with_async_event_handler():
+    """
+    Async handlers should work with custom Event objects.
+    """
+    event = Event()
+    call_flag = asyncio.Event()
+    counter = 0
+
+    @when(event)
+    async def handler(result):
+        nonlocal counter
+        counter += 1
+        assert result == "async test"
+        call_flag.set()
+
+    assert counter == 0
+    event.trigger("async test")
+    await call_flag.wait()
     assert counter == 1
 
-def test_when_on_different_callables():
+
+async def test_when_with_element_selector():
     """
-    The when function works with:
-
-    * Synchronous functions
-    * Asynchronous functions
-    * Inner functions
-    * Async inner functions
-    * Closure functions
-    * Async closure functions
+    The @when decorator should accept an Element object as selector.
     """
+    btn = web.button("test", id="elem_selector_test")
+    container = get_container()
+    container.append(btn)
 
-    def func(x=1):
-        # A simple function.
-        return x
+    called = False
+    call_flag = asyncio.Event()
 
-    async def a_func(x=1):
-        # A simple async function.
-        return x
+    @when("click", btn)
+    def handler(event):
+        nonlocal called
+        called = True
+        call_flag.set()
+
+    btn.click()
+    await call_flag.wait()
+    assert called
+
+
+async def test_when_with_element_collection_selector():
+    """
+    The @when decorator should accept an ElementCollection as selector.
+    """
+    btn1 = web.button("btn1", id="col_test_1", classes=["test-class"])
+    btn2 = web.button("btn2", id="col_test_2", classes=["test-class"])
+    container = get_container()
+    container.append(btn1)
+    container.append(btn2)
+
+    collection = web.page.find(".test-class")
+    counter = 0
+    call_flag = asyncio.Event()
+
+    @when("click", collection)
+    def handler(event):
+        nonlocal counter
+        counter += 1
+        if counter == 2:
+            call_flag.set()
+
+    btn1.click()
+    btn2.click()
+    await call_flag.wait()
+    assert counter == 2
+
+
+async def test_when_with_list_of_elements():
+    """
+    The @when decorator should accept a list of DOM elements as selector.
+    """
+    btn1 = web.button("btn1", id="list_test_1")
+    btn2 = web.button("btn2", id="list_test_2")
+    container = get_container()
+    container.append(btn1)
+    container.append(btn2)
+
+    elements = [btn1._dom_element, btn2._dom_element]
+    counter = 0
+    call_flag = asyncio.Event()
+
+    @when("click", elements)
+    def handler(event):
+        nonlocal counter
+        counter += 1
+        if counter == 2:
+            call_flag.set()
+
+    btn1.click()
+    btn2.click()
+    await call_flag.wait()
+    assert counter == 2
+
+
+def test_when_decorator_returns_wrapper():
+    """
+    The @when decorator should return the wrapped function.
+    """
+    event = Event()
+
+    @when(event)
+    def handler(result):
+        return result
+
+    assert callable(handler)
+
+
+def test_when_multiple_events_on_same_handler():
+    """
+    Multiple @when decorators can be stacked on the same function.
+    """
+    event1 = Event()
+    event2 = Event()
+    counter = 0
+
+    @when(event1)
+    @when(event2)
+    def handler(result):
+        nonlocal counter
+        counter += 1
+
+    assert counter == 0
+    event1.trigger("test")
+    assert counter == 1
+    event2.trigger("test")
+    assert counter == 2
+
+
+async def test_when_on_different_callables():
+    """
+    The @when decorator works with various callable types.
+    """
+    results = []
+
+    def func(x):
+        results.append("func")
+
+    async def a_func(x):
+        results.append("a_func")
 
     def make_inner_func():
-        # Creates a simple inner function.
-
-        def inner_func(x=1):
-            return x
+        def inner_func(x):
+            results.append("inner_func")
 
         return inner_func
 
-
     def make_inner_a_func():
-        # Creates a simple async inner function.
-
-        async def inner_a_func(x=1):
-            return x
+        async def inner_a_func(x):
+            results.append("inner_a_func")
 
         return inner_a_func
 
-
     def make_closure():
-        # Creates a simple closure function.
         a = 1
 
-        def closure_func(x=1):
-            return a + x
+        def closure_func(x):
+            results.append(f"closure_func:{a}")
 
         return closure_func
 
-
     def make_a_closure():
-        # Creates a simple async closure function.
         a = 1
 
-        async def closure_a_func(x=1):
-            return a + x
+        async def closure_a_func(x):
+            results.append(f"closure_a_func:{a}")
 
         return closure_a_func
 
-
     inner_func = make_inner_func()
     inner_a_func = make_inner_a_func()
     cl_func = make_closure()
     cl_a_func = make_a_closure()
 
+    whenable = Event()
 
-    whenable  = Event()
+    # Each of these should work with the @when decorator.
+    when(whenable)(func)
+    when(whenable)(a_func)
+    when(whenable)(inner_func)
+    when(whenable)(inner_a_func)
+    when(whenable)(cl_func)
+    when(whenable)(cl_a_func)
 
-    # Each of these should work with the when function.
-    when(whenable, func)
-    when(whenable, a_func)
-    when(whenable, inner_func)
-    when(whenable, inner_a_func)
-    when(whenable, cl_func)
-    when(whenable, cl_a_func)
-    # If we get here, everything worked.
-    assert True
+    # Verify no handlers have been called yet.
+    assert len(results) == 0
+
+    # Trigger the event.
+    whenable.trigger("test")
+
+    # Wait for async handlers to complete.
+    await asyncio.sleep(0.1)
+
+    # Verify all handlers were called.
+    assert len(results) == 6
+    assert "func" in results
+    assert "a_func" in results
+    assert "inner_func" in results
+    assert "inner_a_func" in results
+    assert "closure_func:1" in results
+    assert "closure_a_func:1" in results
+
+
+async def test_when_dom_event_with_options():
+    """
+    Options should be passed to addEventListener for DOM events.
+    """
+    click_count = 0
+    call_flag = asyncio.Event()
+
+    @when("click", "#button-for-event-testing", once=True)
+    def handle_click(event):
+        nonlocal click_count
+        click_count += 1
+        call_flag.set()
+
+    btn = web.page["#button-for-event-testing"]
+    btn.click()
+    await call_flag.wait()
+    assert click_count == 1
+
+    # Click again - should not increment due to once=True.
+    btn.click()
+    # Bit of a bodge - a brief wait to ensure no handler fires.
+    await asyncio.sleep(0.01)
+    assert click_count == 1
+
+
+async def test_when_custom_event_options_ignored():
+    """
+    Options should be silently ignored for custom Event objects.
+    """
+    my_event = Event()
+    trigger_count = 0
+    call_flag = asyncio.Event()
+
+    @when(my_event, once=True)
+    def handler(result):
+        nonlocal trigger_count
+        trigger_count += 1
+        if trigger_count == 2:
+            call_flag.set()
+
+    # Should trigger multiple times despite once=True being ignored.
+    my_event.trigger("first")
+    my_event.trigger("second")
+    await call_flag.wait()
+    assert trigger_count == 2
diff --git a/core/tests/python/tests/test_fetch.py b/core/tests/python/tests/test_fetch.py
index 0af2322a..4148f793 100644
--- a/core/tests/python/tests/test_fetch.py
+++ b/core/tests/python/tests/test_fetch.py
@@ -1,7 +1,8 @@
 """
-Ensure the pyscript.test function behaves as expected.
+Tests for the fetch function and response handling.
 """
 
+import json
 from pyscript import fetch
 
 
@@ -18,6 +19,17 @@ async def test_fetch_json():
     assert data["completed"] is False
 
 
+async def test_fetch_json_direct():
+    """
+    The fetch function should support direct method chaining for JSON.
+    """
+    data = await fetch("https://jsonplaceholder.typicode.com/todos/1").json()
+    assert data["userId"] == 1
+    assert data["id"] == 1
+    assert data["title"] == "delectus aut autem"
+    assert data["completed"] is False
+
+
 async def test_fetch_text():
     """
     The fetch function should return the expected text response.
@@ -31,6 +43,17 @@ async def test_fetch_text():
     assert "1" in text
 
 
+async def test_fetch_text_direct():
+    """
+    The fetch function should support direct method chaining for text.
+    """
+    text = await fetch("https://jsonplaceholder.typicode.com/todos/1").text()
+    assert "delectus aut autem" in text
+    assert "completed" in text
+    assert "false" in text
+    assert "1" in text
+
+
 async def test_fetch_bytearray():
     """
     The fetch function should return the expected bytearray response.
@@ -38,12 +61,22 @@ async def test_fetch_bytearray():
     response = await fetch("https://jsonplaceholder.typicode.com/todos/1")
     assert response.ok
     data = await response.bytearray()
+    assert isinstance(data, bytearray)
     assert b"delectus aut autem" in data
     assert b"completed" in data
     assert b"false" in data
     assert b"1" in data
 
 
+async def test_fetch_bytearray_direct():
+    """
+    The fetch function should support direct method chaining for bytearray.
+    """
+    data = await fetch("https://jsonplaceholder.typicode.com/todos/1").bytearray()
+    assert isinstance(data, bytearray)
+    assert b"delectus aut autem" in data
+
+
 async def test_fetch_array_buffer():
     """
     The fetch function should return the expected array buffer response.
@@ -58,26 +91,217 @@ async def test_fetch_array_buffer():
     assert b"1" in bytes_
 
 
-async def test_fetch_ok():
+async def test_fetch_array_buffer_direct():
     """
-    The fetch function should return a response with ok set to True for an
-    existing URL.
+    The fetch function should support direct method chaining for arrayBuffer.
+    """
+    data = await fetch("https://jsonplaceholder.typicode.com/todos/1").arrayBuffer()
+    bytes_ = bytes(data)
+    assert b"delectus aut autem" in bytes_
+
+
+async def test_fetch_blob():
+    """
+    The fetch function should return a blob response.
     """
     response = await fetch("https://jsonplaceholder.typicode.com/todos/1")
     assert response.ok
-    assert response.status == 200
-    data = await response.json()
-    assert data["userId"] == 1
-    assert data["id"] == 1
-    assert data["title"] == "delectus aut autem"
-    assert data["completed"] is False
+    blob = await response.blob()
+    assert blob.size > 0
+    assert blob.type in ["application/json", "application/json; charset=utf-8"]
 
 
-async def test_fetch_not_ok():
+async def test_fetch_blob_direct():
     """
-    The fetch function should return a response with ok set to False for a
-    non-existent URL.
+    The fetch function should support direct method chaining for blob.
+    """
+    blob = await fetch("https://jsonplaceholder.typicode.com/todos/1").blob()
+    assert blob.size > 0
+    assert blob.type in ["application/json", "application/json; charset=utf-8"]
+
+
+async def test_fetch_response_ok():
+    """
+    The fetch function should return a response with ok set to True for
+    successful requests.
+    """
+    response = await fetch("https://jsonplaceholder.typicode.com/todos/1")
+    assert response.ok
+
+
+async def test_fetch_response_not_ok():
+    """
+    The fetch function should return a response with ok set to False for
+    failed requests.
     """
     response = await fetch("https://jsonplaceholder.typicode.com/todos/1000")
     assert not response.ok
     assert response.status == 404
+
+
+async def test_fetch_response_status():
+    """
+    The fetch function should provide access to response status code.
+    """
+    response = await fetch("https://jsonplaceholder.typicode.com/todos/1")
+    assert response.status == 200
+
+
+async def test_fetch_response_status_text():
+    """
+    The fetch function should provide access to response statusText.
+    Note: HTTP/2 responses often have empty statusText, so we just verify
+    the property exists and is a string.
+    """
+    response = await fetch("https://jsonplaceholder.typicode.com/todos/1")
+    assert isinstance(response.statusText, str)
+    assert response.statusText in ["", "OK"]
+
+
+async def test_fetch_with_post_method():
+    """
+    The fetch function should support POST requests.
+    """
+    response = await fetch(
+        "https://jsonplaceholder.typicode.com/posts",
+        method="POST",
+        headers={"Content-Type": "application/json"},
+        body=json.dumps({"title": "foo", "body": "bar", "userId": 1}),
+    )
+    assert response.ok
+    assert response.status == 201
+    data = await response.json()
+    assert data["title"] == "foo"
+    assert data["body"] == "bar"
+    assert data["userId"] == 1
+    assert "id" in data
+
+
+async def test_fetch_with_put_method():
+    """
+    The fetch function should support PUT requests.
+    """
+    response = await fetch(
+        "https://jsonplaceholder.typicode.com/posts/1",
+        method="PUT",
+        headers={"Content-Type": "application/json"},
+        body=json.dumps(
+            {"id": 1, "title": "updated", "body": "updated body", "userId": 1}
+        ),
+    )
+    assert response.ok
+    assert response.status == 200
+    data = await response.json()
+    assert data["title"] == "updated"
+    assert data["body"] == "updated body"
+
+
+async def test_fetch_with_delete_method():
+    """
+    The fetch function should support DELETE requests.
+    """
+    response = await fetch(
+        "https://jsonplaceholder.typicode.com/posts/1",
+        method="DELETE",
+    )
+    assert response.ok
+    assert response.status == 200
+
+
+async def test_fetch_with_custom_headers():
+    """
+    The fetch function should support custom headers.
+    """
+    response = await fetch(
+        "https://jsonplaceholder.typicode.com/todos/1",
+        headers={"Accept": "application/json"},
+    )
+    assert response.ok
+    data = await response.json()
+    assert data["id"] == 1
+
+
+async def test_fetch_multiple_data_extractions():
+    """
+    The fetch function could allow multiple data extractions from the same
+    response when using the await pattern. This is a strange one, kept in
+    for completeness. Note that browser behaviour may vary here (see inline
+    comments). ;-)
+    """
+    response = await fetch("https://jsonplaceholder.typicode.com/todos/1")
+
+    # First extraction.
+    text1 = await response.text()
+    assert "delectus aut autem" in text1
+    # Second extraction behaviour varies by browser.
+    try:
+        text2 = await response.text()
+        # Some browsers allow it and return empty or repeated data.
+        assert text2 == "" or "delectus aut autem" in text2
+    except Exception:
+        # Other browsers throw an exception for already-consumed body.
+        # This is expected and valid behaviour per the fetch spec.
+        pass
+
+
+async def test_fetch_404_error_handling():
+    """
+    The fetch function should handle 404 responses gracefully.
+    """
+    response = await fetch("https://jsonplaceholder.typicode.com/todos/999999")
+    assert not response.ok
+    assert response.status == 404
+    # Should still be able to extract data even from error responses.
+    data = await response.json()
+    assert data == {}
+
+
+async def test_fetch_error_response_with_text():
+    """
+    Error responses should still allow text extraction.
+    """
+    response = await fetch("https://jsonplaceholder.typicode.com/todos/999999")
+    assert not response.ok
+    text = await response.text()
+    # Error responses may have empty or JSON content.
+    assert isinstance(text, str)
+
+
+async def test_fetch_response_headers():
+    """
+    The fetch function should provide access to response headers.
+    """
+    response = await fetch("https://jsonplaceholder.typicode.com/todos/1")
+    assert response.ok
+    # Access headers through the underlying response object.
+    content_type = response.headers.get("content-type")
+    assert "application/json" in content_type
+
+
+async def test_fetch_direct_chaining_with_error():
+    """
+    Direct method chaining should work even with error responses.
+    """
+    data = await fetch("https://jsonplaceholder.typicode.com/todos/999999").json()
+    # Should return empty dict for 404. This is expected API behaviour
+    # from the jsonplaceholder API.
+    assert data == {}
+
+
+async def test_fetch_options_passed_correctly():
+    """
+    The fetch function should correctly pass options to the underlying
+    JavaScript fetch.
+    """
+    response = await fetch(
+        "https://jsonplaceholder.typicode.com/posts",
+        method="POST",
+        headers={
+            "Content-Type": "application/json",
+            "X-Custom-Header": "test-value",
+        },
+        body=json.dumps({"test": "data"}),
+    )
+    assert response.ok
+    # The request succeeded, confirming options were passed correctly.
+    assert response.status == 201
diff --git a/core/tests/python/tests/test_ffi.py b/core/tests/python/tests/test_ffi.py
index 49575984..b80d4d0a 100644
--- a/core/tests/python/tests/test_ffi.py
+++ b/core/tests/python/tests/test_ffi.py
@@ -1,5 +1,8 @@
 """
 Exercise (as much as is possible) the pyscript.ffi namespace.
+
+We assume that the underlying `create_proxy` and `to_js` functions
+work as expected (these are tested in Pyodide and MicroPython respectively).
 """
 
 import upytest
@@ -38,3 +41,85 @@ def test_to_js():
     else:
         from pyodide.ffi import JsProxy
     assert isinstance(js_obj, JsProxy)
+
+
+def test_is_none_with_python_none():
+    """
+    The is_none function should return True for Python None.
+    """
+    assert ffi.is_none(None)
+
+
+def test_is_none_with_js_null():
+    """
+    The is_none function should return True for JavaScript null.
+    """
+    import js
+
+    assert ffi.is_none(ffi.jsnull)
+
+
+def test_is_none_with_other_values():
+    """
+    The is_none function should return False for non-null false-y
+    values.
+    """
+    assert not ffi.is_none(0)
+    assert not ffi.is_none("")
+    assert not ffi.is_none(False)
+    assert not ffi.is_none([])
+    assert not ffi.is_none({})
+
+
+def test_assign_single_source():
+    """
+    The assign function should merge a single source object into target.
+    """
+    import js
+
+    target = js.Object.new()
+    ffi.assign(target, {"a": 1, "b": 2})
+
+    assert target.a == 1
+    assert target.b == 2
+
+
+def test_assign_multiple_sources():
+    """
+    The assign function should merge multiple source objects into target.
+    """
+    import js
+
+    target = js.Object.new()
+    ffi.assign(target, {"a": 1}, {"b": 2}, {"c": 3})
+
+    assert target.a == 1
+    assert target.b == 2
+    assert target.c == 3
+
+
+def test_assign_overwrites_properties():
+    """
+    The assign function should overwrite existing properties.
+    """
+    import js
+
+    target = js.Object.new()
+    target.a = 1
+    ffi.assign(target, {"a": 2, "b": 3})
+
+    assert target.a == 2
+    assert target.b == 3
+
+
+def test_assign_returns_target():
+    """
+    The assign function should return the modified target object.
+    """
+    import js
+
+    target = js.Object.new()
+    result = ffi.assign(target, {"a": 1})
+
+    assert result is target
+    assert result.a == 1
diff --git a/core/tests/python/tests/test_fs.py b/core/tests/python/tests/test_fs.py
new file mode 100644
index 00000000..e8f1c633
--- /dev/null
+++ b/core/tests/python/tests/test_fs.py
@@ -0,0 +1,56 @@
+"""
+**INCOMPLETE** tests for the pyscript.fs module.
+
+Note: Full unit tests require Chromium browser and user interaction
+to grant filesystem permissions. These tests focus on validation logic and
+error handling that can be tested without permissions.
+"""
+
+import upytest
+from pyscript import fs
+
+
+def test_mounted_dict_accessible():
+    """
+    The mounted dictionary should be accessible and be a dict.
+    """
+    assert hasattr(fs, "mounted")
+    assert isinstance(fs.mounted, dict)
+
+
+def test_functions_exist():
+    """
+    All public fs functions should exist and be callable.
+    """
+    assert hasattr(fs, "mount")
+    assert callable(fs.mount)
+    assert hasattr(fs, "sync")
+    assert callable(fs.sync)
+    assert hasattr(fs, "unmount")
+    assert callable(fs.unmount)
+    assert hasattr(fs, "revoke")
+    assert callable(fs.revoke)
+
+
+async def test_sync_unmounted_path():
+    """
+    Syncing an unmounted path should raise KeyError with helpful message.
+    """
+    with upytest.raises(KeyError):
+        await fs.sync("/nonexistent")
+
+
+async def test_unmount_unmounted_path():
+    """
+    Unmounting an unmounted path should raise KeyError with helpful message.
+    """
+    with upytest.raises(KeyError):
+        await fs.unmount("/nonexistent")
+
+
+def test_check_permission_function_exists():
+    """
+    The internal _check_permission function should exist.
+    """
+    assert hasattr(fs, "_check_permission")
+    assert callable(fs._check_permission)
diff --git a/core/tests/python/tests/test_media.py b/core/tests/python/tests/test_media.py
index c726d350..a79e6604 100644
--- a/core/tests/python/tests/test_media.py
+++ b/core/tests/python/tests/test_media.py
@@ -1,4 +1,4 @@
-""""
+"""
 Tests for the PyScript media module.
 """
 
@@ -7,80 +7,170 @@ import upytest
 from pyscript import media
 
 
-@upytest.skip(
-    "Uses Pyodide-specific to_js function in MicroPython",
-    skip_when=upytest.is_micropython,
-)
-async def test_device_enumeration():
-    """Test enumerating media devices."""
-    devices = await media.list_devices()
-    assert isinstance(devices, list), "list_devices should return a list"
-
-    # If devices are found, verify they have the expected functionality
-    if devices:
-        device = devices[0]
-
-        # Test real device properties exist (but don't assert on their values)
-        # Browser security might restrict actual values until permissions are granted
-        assert hasattr(device, "id"), "Device should have id property"
-        assert hasattr(device, "kind"), "Device should have kind property"
-        assert device.kind in [
-            "videoinput",
-            "audioinput",
-            "audiooutput",
-        ], f"Device should have a valid kind, got: {device.kind}"
-
-        # Verify dictionary access works with actual device
-        assert (
-            device["id"] == device.id
-        ), "Dictionary access should match property access"
-        assert (
-            device["kind"] == device.kind
-        ), "Dictionary access should match property access"
-
-
-@upytest.skip("Waiting on a bug-fix in MicroPython, for this test to work.", skip_when=upytest.is_micropython)
-async def test_video_stream_acquisition():
-    """Test video stream."""
+async def test_list_devices_returns_list():
+    """
+    The list_devices function should return a list of Device objects.
+    """
     try:
-        # Load a video stream
-        stream = await media.Device.load(video=True)
-
-        # Verify we get a real stream with expected properties
-        assert hasattr(stream, "active"), "Stream should have active property"
-
-        # Check for video tracks, but don't fail if permissions aren't granted
-        if stream._dom_element and hasattr(stream._dom_element, "getVideoTracks"):
-            tracks = stream._dom_element.getVideoTracks()
-            if tracks.length > 0:
-                assert True, "Video stream has video tracks"
-    except Exception as e:
-        # If the browser blocks access, the test should still pass
-        # This is because we're testing the API works, not that permissions are granted
-        assert (
-            True
-        ), f"Stream acquisition attempted but may require permissions: {str(e)}"
+        devices = await media.list_devices()
+        assert isinstance(devices, list)
+    except Exception:
+        # Permission denied or no devices available - test passes.
+        pass
 
 
-@upytest.skip("Waiting on a bug-fix in MicroPython, for this test to work.", skip_when=upytest.is_micropython)
-async def test_custom_video_constraints():
-    """Test loading video with custom constraints."""
+async def test_device_properties():
+    """
+    Device objects should have expected properties.
+    """
+    try:
+        devices = await media.list_devices()
+
+        if devices:
+            device = devices[0]
+
+            # Test all properties exist.
+            assert hasattr(device, "id")
+            assert hasattr(device, "kind")
+            assert hasattr(device, "label")
+            assert hasattr(device, "group")
+
+            # Test kind has valid value.
+            assert device.kind in [
+                "videoinput",
+                "audioinput",
+                "audiooutput",
+            ]
+    except Exception:
+        # Permission denied or no devices available - test passes.
+        pass
+
+
+async def test_device_dict_access():
+    """
+    Device objects should support dictionary-style access for JavaScript
+    interop.
+    """
+    try:
+        devices = await media.list_devices()
+
+        if devices:
+            device = devices[0]
+
+            # Dictionary access should match property access.
+            assert device["id"] == device.id
+            assert device["kind"] == device.kind
+            assert device["label"] == device.label
+            assert device["group"] == device.group
+    except Exception:
+        # Permission denied or no devices available - test passes.
+        pass
+
+
+async def test_request_stream_video_only():
+    """
+    The request_stream method should return a stream for video only.
+    """
+    try:
+        stream = await media.Device.request_stream(video=True)
+        assert hasattr(stream, "active")
+    except Exception:
+        # Permission denied or no devices available - test passes.
+        pass
+
+
+async def test_request_stream_audio_only():
+    """
+    The request_stream method should return a stream for audio only.
+    """
+    try:
+        stream = await media.Device.request_stream(audio=True, video=False)
+        assert hasattr(stream, "active")
+    except Exception:
+        # Permission denied or no devices available - test passes.
+        pass
+
+
+async def test_request_stream_audio_and_video():
+    """
+    The request_stream method should return a stream for both audio and video.
+    """
+    try:
+        stream = await media.Device.request_stream(audio=True, video=True)
+        assert hasattr(stream, "active")
+    except Exception:
+        # Permission denied or no devices available - test passes.
+        pass
+
+
+async def test_request_stream_with_constraints():
+    """
+    The request_stream method should accept video constraints as a dict.
+    """
     try:
-        # Define custom constraints
         constraints = {"width": 640, "height": 480}
+        stream = await media.Device.request_stream(video=constraints)
+        assert hasattr(stream, "active")
+    except Exception:
+        # Permission denied or no devices available - test passes.
+        pass
 
-        # Load stream with custom constraints
-        stream = await media.Device.load(video=constraints)
 
-        # Basic stream property check
-        assert hasattr(stream, "active"), "Stream should have active property"
+async def test_load_backwards_compatibility():
+    """
+    The deprecated load method should still work for backwards compatibility.
+    """
+    try:
+        stream = await media.Device.load(video=True)
+        assert hasattr(stream, "active")
+    except Exception:
+        # Permission denied or no devices available - test passes.
+        pass
 
-        # Check for tracks only if we have access
-        if stream._dom_element and hasattr(stream._dom_element, "getVideoTracks"):
-            tracks = stream._dom_element.getVideoTracks()
-            if tracks.length > 0 and hasattr(tracks[0], "getSettings"):
-                # Settings verification is optional - browsers may handle constraints differently
-                pass
-    except Exception as e:
-        # If the browser blocks access, test that the API structure works
-        assert True, f"Custom constraint test attempted: {str(e)}"
+
+@upytest.skip(
+    "Blocks on Pyodide due to permission dialog.",
+    skip_when=not upytest.is_micropython,
+)
+async def test_device_get_stream():
+    """
+    The get_stream instance method should return a stream from a specific
+    device.
+    """
+    try:
+        devices = await media.list_devices()
+
+        # Find a video input device to test with.
+        video_devices = [d for d in devices if d.kind == "videoinput"]
+
+        if video_devices:
+            stream = await video_devices[0].get_stream()
+            assert hasattr(stream, "active")
+    except Exception:
+        # Permission denied or no devices available - test passes.
+        pass
+
+
+async def test_device_filtering_by_kind():
+    """
+    Devices should be filterable by their kind property.
+    """
+    try:
+        devices = await media.list_devices()
+
+        video_inputs = [d for d in devices if d.kind == "videoinput"]
+        audio_inputs = [d for d in devices if d.kind == "audioinput"]
+        audio_outputs = [d for d in devices if d.kind == "audiooutput"]
+
+        # All filtered devices should have correct kind.
+        for device in video_inputs:
+            assert device.kind == "videoinput"
+
+        for device in audio_inputs:
+            assert device.kind == "audioinput"
+
+        for device in audio_outputs:
+            assert device.kind == "audiooutput"
+    except Exception:
+        # Permission denied or no devices available - test passes.
+        pass
diff --git a/core/tests/python/tests/test_storage.py b/core/tests/python/tests/test_storage.py
index 674a82b3..900b04e3 100644
--- a/core/tests/python/tests/test_storage.py
+++ b/core/tests/python/tests/test_storage.py
@@ -1,5 +1,5 @@
 """
-Ensure the pyscript.storage object behaves as a Python dict.
+Tests for the pyscript.storage module.
 """
 
 from pyscript import Storage, storage
@@ -8,6 +8,9 @@ test_store = None
 
 
 async def setup():
+    """
+    Set up a clean test storage before each test.
+    """
     global test_store
     if test_store is None:
         test_store = await storage("test_store")
@@ -16,6 +19,9 @@ async def setup():
 
 
 async def teardown():
+    """
+    Clean up test storage after each test.
+    """
     if test_store:
         test_store.clear()
         await test_store.sync()
@@ -25,17 +31,17 @@ async def test_storage_as_dict():
     """
     The storage object should behave as a Python dict.
     """
-    # Assign
+    # Assign.
     test_store["a"] = 1
-    # Retrieve
+    # Retrieve.
     assert test_store["a"] == 1
     assert "a" in test_store
     assert len(test_store) == 1
-    # Iterate
+    # Iterate.
     for k, v in test_store.items():
         assert k == "a"
         assert v == 1
-    # Remove
+    # Remove.
     del test_store["a"]
     assert "a" not in test_store
     assert len(test_store) == 0
@@ -86,3 +92,233 @@ async def test_storage_clear():
     assert len(test_store) == 2
     test_store.clear()
     assert len(test_store) == 0
+
+
+async def test_storage_get_method():
+    """
+    The get method should return default value for missing keys.
+    """
+    test_store["exists"] = "value"
+
+    assert test_store.get("exists") == "value"
+    assert test_store.get("missing") is None
+    assert test_store.get("missing", "default") == "default"
+
+
+async def test_storage_keys_values_items():
+    """
+    The keys, values, and items methods should work like dict.
+    """
+    test_store["a"] = 1
+    test_store["b"] = 2
+    test_store["c"] = 3
+
+    assert set(test_store.keys()) == {"a", "b", "c"}
+    assert set(test_store.values()) == {1, 2, 3}
+    assert set(test_store.items()) == {("a", 1), ("b", 2), ("c", 3)}
+
+
+async def test_storage_update():
+    """
+    The update method should add multiple items at once.
+    """
+    test_store["a"] = 1
+
+    # Update with dict.
+    test_store.update({"b": 2, "c": 3})
+    assert test_store["b"] == 2
+    assert test_store["c"] == 3
+
+    # Update with keyword arguments.
+    test_store.update(d=4, e=5)
+    assert test_store["d"] == 4
+    assert test_store["e"] == 5
+
+
+async def test_storage_pop():
+    """
+    The pop method should remove and return values.
+    """
+    test_store["a"] = 1
+    test_store["b"] = 2
+
+    value = test_store.pop("a")
+    assert value == 1
+    assert "a" not in test_store
+    assert len(test_store) == 1
+
+    # Pop with default.
+    value = test_store.pop("missing", "default")
+    assert value == "default"
+
+
+async def test_storage_persistence():
+    """
+    Data should persist after sync and reload.
+    """
+    test_store["persistent"] = "value"
+    await test_store.sync()
+
+    # Reload the same storage.
+    reloaded = await storage("test_store")
+    assert reloaded["persistent"] == "value"
+
+
+async def test_storage_nested_structures():
+    """
+    Nested data structures should be stored and retrieved correctly.
+    """
+    nested = {
+        "level1": {"level2": {"level3": [1, 2, 3]}},
+        "list_of_dicts": [{"a": 1}, {"b": 2}, {"c": 3}],
+    }
+
+    test_store["nested"] = nested
+    await test_store.sync()
+
+    retrieved = test_store["nested"]
+    assert retrieved["level1"]["level2"]["level3"] == [1, 2, 3]
+    assert retrieved["list_of_dicts"][0]["a"] == 1
+
+
+async def test_storage_overwrite():
+    """
+    Overwriting values should work correctly.
+    """
+    test_store["key"] = "original"
+    assert test_store["key"] == "original"
+
+    test_store["key"] = "updated"
+    assert test_store["key"] == "updated"
+
+
+async def test_storage_empty_string_key():
+    """
+    Empty strings should be valid keys.
+    """
+    test_store[""] = "empty key"
+    assert "" in test_store
+    assert test_store[""] == "empty key"
+
+
+async def test_storage_special_characters_in_keys():
+    """
+    Keys with special characters should work.
+    """
+    test_store["key with spaces"] = 1
+    test_store["key-with-dashes"] = 2
+    test_store["key.with.dots"] = 3
+    test_store["key/with/slashes"] = 4
+
+    assert test_store["key with spaces"] == 1
+    assert test_store["key-with-dashes"] == 2
+    assert test_store["key.with.dots"] == 3
+    assert test_store["key/with/slashes"] == 4
+
+
+async def test_storage_multiple_stores():
+    """
+    Multiple named storages should be independent.
+    """
+    store1 = await storage("store1")
+    store2 = await storage("store2")
+
+    store1.clear()
+    store2.clear()
+
+    store1["key"] = "value1"
+    store2["key"] = "value2"
+
+    assert store1["key"] == "value1"
+    assert store2["key"] == "value2"
+
+    # Clean up.
+    store1.clear()
+    store2.clear()
+    await store1.sync()
+    await store2.sync()
+
+
+async def test_storage_empty_name_raises():
+    """
+    Creating storage with empty name should raise ValueError.
+    """
+    try:
+        await storage("")
+        assert False, "Should have raised ValueError"
+    except ValueError as e:
+        assert "non-empty" in str(e)
+
+
+async def test_custom_storage_class():
+    """
+    Custom Storage subclasses should work correctly.
+    """
+    calls = []
+
+    class TrackingStorage(Storage):
+        def __setitem__(self, key, value):
+            calls.append(("set", key, value))
+            super().__setitem__(key, value)
+
+        def __delitem__(self, key):
+            calls.append(("del", key))
+            super().__delitem__(key)
+
+    custom_store = await storage("custom_test", storage_class=TrackingStorage)
+    custom_store.clear()
+    calls.clear()
+
+    # Test setitem tracking.
+    custom_store["test"] = 123
+    assert ("set", "test", 123) in calls
+    assert custom_store["test"] == 123
+
+    # Test delitem tracking.
+    del custom_store["test"]
+    assert ("del", "test") in calls
+
+    # Clean up.
+    custom_store.clear()
+    await custom_store.sync()
+
+
+async def test_storage_boolean_false_vs_none():
+    """
+    False and None should be distinguishable.
+    """
+    test_store["false"] = False
+    test_store["none"] = None
+
+    assert test_store["false"] is False
+    assert test_store["false"] is not None
+    assert test_store["none"] is None
+    assert test_store["none"] is not False
+
+
+async def test_storage_numeric_zero_vs_none():
+    """
+    Zero and None should be distinguishable.
+    """
+    test_store["zero_int"] = 0
+    test_store["zero_float"] = 0.0
+    test_store["none"] = None
+
+    assert test_store["zero_int"] == 0
+    assert test_store["zero_int"] is not None
+    assert test_store["zero_float"] == 0.0
+    assert test_store["zero_float"] is not None
+    assert test_store["none"] is None
+
+
+async def test_storage_empty_collections():
+    """
+    Empty lists and dicts should be stored correctly.
+    """
+    test_store["empty_list"] = []
+    test_store["empty_dict"] = {}
+
+    assert test_store["empty_list"] == []
+    assert isinstance(test_store["empty_list"], list)
+    assert test_store["empty_dict"] == {}
+    assert isinstance(test_store["empty_dict"], dict)
diff --git a/core/tests/python/tests/test_util.py b/core/tests/python/tests/test_util.py
index 4c98a41a..6f9216dd 100644
--- a/core/tests/python/tests/test_util.py
+++ b/core/tests/python/tests/test_util.py
@@ -1,3 +1,7 @@
+"""
+Tests for the pyscript.util module.
+"""
+
 import upytest
 import js
 from pyscript import util
@@ -5,8 +9,8 @@ from pyscript import util
 
 def test_as_bytearray():
     """
-    Test the as_bytearray function correctly converts a JavaScript ArrayBuffer
-    to a Python bytearray.
+    The as_bytearray function should convert a JavaScript ArrayBuffer to a
+    Python bytearray.
     """
     msg = b"Hello, world!"
     buffer = js.ArrayBuffer.new(len(msg))
@@ -18,31 +22,187 @@ def test_as_bytearray():
     assert ba == msg
 
 
-def test_not_supported():
+def test_as_bytearray_empty():
     """
-    Test the NotSupported class raises an exception when trying to access
-    attributes or call the object.
+    The as_bytearray function should handle empty ArrayBuffers.
+    """
+    buffer = js.ArrayBuffer.new(0)
+    ba = util.as_bytearray(buffer)
+    assert isinstance(ba, bytearray)
+    assert len(ba) == 0
+
+
+def test_as_bytearray_binary_data():
+    """
+    The as_bytearray function should handle binary data with all byte values.
+    """
+    # Test with all possible byte values.
+    data = bytes(range(256))
+    buffer = js.ArrayBuffer.new(len(data))
+    ui8a = js.Uint8Array.new(buffer)
+    for i, b in enumerate(data):
+        ui8a[i] = b
+    ba = util.as_bytearray(buffer)
+    assert ba == bytearray(data)
+
+
+def test_not_supported_repr():
+    """
+    The NotSupported class should have a meaningful repr.
+    """
+    ns = util.NotSupported("test_feature", "Feature not available")
+    repr_str = repr(ns)
+    assert "NotSupported" in repr_str
+    assert "test_feature" in repr_str
+
+
+def test_not_supported_getattr():
+    """
+    The NotSupported class should raise AttributeError on attribute access.
     """
     ns = util.NotSupported("test", "This is not supported.")
     with upytest.raises(AttributeError) as e:
-        ns.test
-    assert str(e.exception) == "This is not supported.", str(e.exception)
+        ns.some_attr
+    assert str(e.exception) == "This is not supported."
+
+
+def test_not_supported_setattr():
+    """
+    The NotSupported class should raise AttributeError on attribute
+    assignment.
+    """
+    ns = util.NotSupported("test", "This is not supported.")
     with upytest.raises(AttributeError) as e:
-        ns.test = 1
-    assert str(e.exception) == "This is not supported.", str(e.exception)
+        ns.some_attr = 1
+    assert str(e.exception) == "This is not supported."
+
+
+def test_not_supported_call():
+    """
+    The NotSupported class should raise TypeError when called.
+    """
+    ns = util.NotSupported("test", "This is not supported.")
     with upytest.raises(TypeError) as e:
         ns()
-    assert str(e.exception) == "This is not supported.", str(e.exception)
+    assert str(e.exception) == "This is not supported."
 
 
-def test_is_awaitable():
+def test_not_supported_call_with_args():
     """
-    Test the is_awaitable function correctly identifies an asynchronous
-    function.
+    The NotSupported class should raise TypeError when called with arguments.
+    """
+    ns = util.NotSupported("test", "This is not supported.")
+    with upytest.raises(TypeError) as e:
+        ns(1, 2, 3)
+    assert str(e.exception) == "This is not supported."
+
+
+def test_is_awaitable_async_function():
+    """
+    The is_awaitable function should identify async functions as awaitable.
     """
 
     async def async_func():
-        yield
+        pass
 
     assert util.is_awaitable(async_func)
+
+
+def test_is_awaitable_regular_function():
+    """
+    The is_awaitable function should identify regular functions as not
+    awaitable.
+    """
+
+    def regular_func():
+        pass
+
+    assert not util.is_awaitable(regular_func)
+
+
+def test_is_awaitable_lambda():
+    """
+    The is_awaitable function should identify lambdas as not awaitable.
+    """
     assert not util.is_awaitable(lambda: None)
+
+
+def test_is_awaitable_async_lambda():
+    """
+    The is_awaitable function should identify async lambdas as awaitable.
+    """
+    # Note: async lambdas don't exist in Python, but this documents the
+    # expected behavior.
+    async_lambda = lambda: (yield)
+    # This test documents current behavior - may vary by implementation.
+
+
+def test_is_awaitable_generator():
+    """
+    The is_awaitable function should handle generator functions correctly.
+    """
+
+    def gen_func():
+        yield 1
+
+    # Generator functions are treated differently in MicroPython vs Pyodide.
+    # In MicroPython, async functions are generator functions.
+    result = util.is_awaitable(gen_func)
+    # Result depends on Python implementation.
+    assert isinstance(result, bool)
+
+
+def test_is_awaitable_async_closure():
+    """
+    The is_awaitable function should handle async closures correctly.
+    """
+
+    def make_async_closure():
+        async def inner():
+            pass
+
+        return inner
+
+    closure = make_async_closure()
+    assert util.is_awaitable(closure)
+
+
+def test_is_awaitable_regular_closure():
+    """
+    The is_awaitable function should handle regular closures correctly.
+    """
+
+    def make_closure():
+        def inner():
+            pass
+
+        return inner
+
+    closure = make_closure()
+    assert not util.is_awaitable(closure)
+
+
+def test_is_awaitable_builtin():
+    """
+    The is_awaitable function should identify built-in functions as not
+    awaitable.
+    """
+    assert not util.is_awaitable(print)
+    assert not util.is_awaitable(len)
+
+
+def test_is_awaitable_class_method():
+    """
+    The is_awaitable function should handle class methods correctly.
+    """
+
+    class TestClass:
+        async def async_method(self):
+            pass
+
+        def sync_method(self):
+            pass
+
+    obj = TestClass()
+    assert util.is_awaitable(obj.async_method)
+    assert not util.is_awaitable(obj.sync_method)
diff --git a/core/tests/python/tests/test_web.py b/core/tests/python/tests/test_web.py
index 0a00aada..1084e2b7 100644
--- a/core/tests/python/tests/test_web.py
+++ b/core/tests/python/tests/test_web.py
@@ -6,6 +6,7 @@ import asyncio
 
 import upytest
 from pyscript import RUNNING_IN_WORKER, document, web, when
+from pyscript.ffi import to_js
 
 
 def setup():
@@ -22,14 +23,22 @@ def test_getitem_by_id():
     """
     An element with an id in the DOM can be retrieved by id.
     """
-    result = web.page.find("#div-no-classes")
-    # There is a single result.
-    assert len(result) == 1
+    result = web.page["#div-no-classes"]
     # The result is a div.
-    assert result[0].get_tag_name() == "div"
+    assert result.get_tag_name() == "div"
+    # The result has the expected id.
+    assert result.id == "div-no-classes"
+    # Now do the same but without the '#'
+    result = web.page["div-no-classes"]
+    assert result.get_tag_name() == "div"
+    assert result.id == "div-no-classes"
 
 
-def test_getitem_by_class():
+def test_find_item_by_class():
+    """
+    Elements with a given class in the DOM can be retrieved by class via the
+    find method.
+    """
     ids = [
         "test_class_selector",
         "test_selector_w_children",
@@ -37,35 +46,188 @@ def test_getitem_by_class():
     ]
     expected_class = "a-test-class"
     result = web.page.find(f".{expected_class}")
-
     # EXPECT to find exact number of elements with the class in the page (== 3)
     assert len(result) == 3
-
     # EXPECT that all element ids are in the expected list
     assert [el.id for el in result] == ids
 
 
 def test_read_n_write_collection_elements():
+    """
+    Elements with a given class in the DOM can be retrieved by class via the
+    find method. They can be bulk updated via the update_all method.
+    """
     elements = web.page.find(".multi-elems")
-
     for element in elements:
         assert element.innerHTML == f"Content {element.id.replace('#', '')}"
-
     new_content = "New Content"
-    elements.innerHTML = new_content
+    elements.update_all(innerHTML=new_content)
     for element in elements:
         assert element.innerHTML == new_content
 
 
+class TestHelperFunctions:
+    """
+    Test the internal helper functions.
+    """
+
+    def test_wrap_if_not_none_with_element(self):
+        """
+        Test wrapping a valid DOM element.
+        """
+
+        # Create a DOM element.
+        dom_div = document.createElement("div")
+        dom_div.id = "test-wrap"
+
+        # Wrap it.
+        result = web._wrap_if_not_none(dom_div)
+
+        # Should return an Element instance.
+        assert isinstance(result, web.Element)
+        assert result.id == "test-wrap"
+
+    def test_wrap_if_not_none_with_none(self):
+        """
+        Test wrapping None returns None.
+        """
+
+        # Pass None (as a JS null).
+        result = web._wrap_if_not_none(to_js(None))
+
+        # Should return None.
+        assert result is None
+
+    def test_find_by_id_without_hash(self):
+        """
+        Test finding element by id without # prefix.
+        """
+
+        # Create and append an element with an id.
+        test_div = web.div("Test content", id="helper-test-id")
+        web.page.body.append(test_div)
+
+        # Find it using the helper.
+        result = web._find_by_id(document, "helper-test-id")
+
+        # Should find the element.
+        assert result is not None
+        assert result.id == "helper-test-id"
+        assert result.innerHTML == "Test content"
+
+    def test_find_by_id_with_hash(self):
+        """
+        Test finding element by id with # prefix.
+        """
+
+        # Create and append an element with an id.
+        test_div = web.div("Test content", id="helper-test-id-hash")
+        web.page.body.append(test_div)
+
+        # Find it using the helper with # prefix.
+        result = web._find_by_id(document, "#helper-test-id-hash")
+
+        # Should find the element.
+        assert result is not None
+        assert result.id == "helper-test-id-hash"
+
+    def test_find_by_id_not_found(self):
+        """
+        Test finding non-existent id returns None.
+        """
+
+        # Try to find non-existent element.
+        result = web._find_by_id(document, "this-id-does-not-exist")
+
+        # Should return None.
+        assert result is None
+
+    def test_find_by_id_within_element(self):
+        """
+        Test finding by id within a specific element.
+        """
+
+        # Create a container with a child.
+        child = web.p("Child", id="child-in-container")
+        container = web.div(child, id="container-for-search")
+        web.page.body.append(container)
+
+        # Find the child within the container.
+        result = web._find_by_id(container._dom_element, "child-in-container")
+
+        # Should find the child.
+        assert result is not None
+        assert result.id == "child-in-container"
+
+    def test_find_and_wrap_with_results(self):
+        """
+        Test finding elements by selector.
+        """
+
+        # Create multiple elements with same class.
+        container = web.div(
+            web.p("Para 1", classes=["test-para"]),
+            web.p("Para 2", classes=["test-para"]),
+            web.p("Para 3", classes=["test-para"]),
+            id="find-wrap-container",
+        )
+        web.page.body.append(container)
+
+        # Find them using the helper.
+        result = web._find_and_wrap(container._dom_element, ".test-para")
+
+        # Should return an ElementCollection.
+        assert isinstance(result, web.ElementCollection)
+        assert len(result) == 3
+        assert result[0].innerHTML == "Para 1"
+        assert result[1].innerHTML == "Para 2"
+        assert result[2].innerHTML == "Para 3"
+
+    def test_find_and_wrap_no_results(self):
+        """
+        Test finding with selector that matches nothing.
+        """
+
+        # Create a container.
+        container = web.div(id="empty-container")
+        web.page.body.append(container)
+
+        # Find with selector that matches nothing.
+        result = web._find_and_wrap(container._dom_element, ".does-not-exist")
+
+        # Should return empty collection.
+        assert isinstance(result, web.ElementCollection)
+        assert len(result) == 0
+
+    def test_find_and_wrap_on_document(self):
+        """
+        Test finding elements in entire document.
+        """
+
+        # Create elements in the document.
+        web.page.body.append(web.span("Span 1", classes=["doc-span"]))
+        web.page.body.append(web.span("Span 2", classes=["doc-span"]))
+
+        # Find them in the entire document.
+        result = web._find_and_wrap(document, ".doc-span")
+
+        # Should find both.
+        assert isinstance(result, web.ElementCollection)
+        assert len(result) >= 2  # May have others from previous tests.
+
+
 class TestElement:
+    """
+    Test the base Element class functionality.
+    """
 
     def test_query(self):
         # GIVEN an existing element on the page, with at least 1 child element
         id_ = "test_selector_w_children"
-        parent_div = web.page.find(f"#{id_}")[0]
+        parent_div = web.page[f"#{id_}"]
 
         # EXPECT it to be able to query for the first child element
-        div = parent_div.find("div")[0]
+        div = parent_div[0]
 
         # EXPECT the new element to be associated with the parent
         assert (
@@ -101,7 +263,7 @@ class TestElement:
 
     def test_append_element(self):
         id_ = "element-append-tests"
-        div = web.page.find(f"#{id_}")[0]
+        div = web.page[f"#{id_}"]
         len_children_before = len(div.children)
         new_el = web.p("new element")
         div.append(new_el)
@@ -110,7 +272,7 @@ class TestElement:
 
     def test_append_dom_element_element(self):
         id_ = "element-append-tests"
-        div = web.page.find(f"#{id_}")[0]
+        div = web.page[f"#{id_}"]
         len_children_before = len(div.children)
         new_el = web.p("new element")
         div.append(new_el._dom_element)
@@ -119,7 +281,7 @@ class TestElement:
 
     def test_append_collection(self):
         id_ = "element-append-tests"
-        div = web.page.find(f"#{id_}")[0]
+        div = web.page[f"#{id_}"]
         len_children_before = len(div.children)
         collection = web.page.find(".collection")
         div.append(collection)
@@ -131,19 +293,24 @@ class TestElement:
     def test_read_classes(self):
         id_ = "test_class_selector"
         expected_class = "a-test-class"
-        div = web.page.find(f"#{id_}")[0]
-        assert div.classes == [expected_class]
+        div = web.page[f"#{id_}"]
+        assert div.classes == {expected_class}
 
     def test_add_remove_class(self):
         id_ = "div-no-classes"
         classname = "tester-class"
-        div = web.page.find(f"#{id_}")[0]
+        div = web.page[f"#{id_}"]
         assert not div.classes
         div.classes.add(classname)
-        same_div = web.page.find(f"#{id_}")[0]
-        assert div.classes == [classname] == same_div.classes
+        assert div.classes == {classname}
         div.classes.remove(classname)
-        assert div.classes == [] == same_div.classes
+        assert div.classes == set()
+        # Handle multiple classes in a single string
+        multiple_classes = "class1 class2 class3"
+        div.classes.add(multiple_classes)
+        assert div.classes == {"class1", "class2", "class3"}
+        div.classes.remove("class2 class3")
+        assert div.classes == {"class1"}
 
     async def test_when_decorator(self):
         called = False
@@ -243,6 +410,129 @@ class TestElement:
         )
         assert div.textContent == div._dom_element.textContent == "<b>New Content</b>"
 
+    def test_update_classes(self):
+        """Test updating classes via update()."""
+        div = web.div()
+        div.update(classes=["foo", "bar"])
+        assert "foo" in div.classes
+        assert "bar" in div.classes
+
+    def test_update_single_class(self):
+        """Test updating single class string via update()."""
+        div = web.div()
+        div.update(classes="foo")
+        assert "foo" in div.classes
+
+    def test_update_style(self):
+        """Test updating styles via update()."""
+        div = web.div()
+        div.update(style={"color": "red", "font-size": "16px"})
+        assert div.style["color"] == "red", div.style["color"]
+        assert div.style["font-size"] == "16px"
+
+    def test_update_attributes(self):
+        """Test updating attributes via update()."""
+        div = web.div()
+        div.update(id="test-id", title="Test Title")
+        assert div.id == "test-id"
+        assert div.title == "Test Title"
+
+    def test_update_combined(self):
+        """Test updating classes, styles, and attributes together."""
+        div = web.div()
+        div.update(classes=["foo"], style={"color": "red"}, id="test-id")
+        assert "foo" in div.classes
+        assert div.style["color"] == "red"
+        assert div.id == "test-id"
+
+    def test_getitem_integer_index(self):
+        """Test indexing children by integer."""
+        parent = web.div(web.p("Child 1"), web.p("Child 2"))
+        assert parent[0].innerHTML == "Child 1"
+        assert parent[1].innerHTML == "Child 2"
+
+    def test_getitem_slice(self):
+        """Test slicing children."""
+        parent = web.div(web.p("Child 1"), web.p("Child 2"), web.p("Child 3"))
+        sliced = parent[0:2]
+        assert len(sliced) == 2
+        assert sliced[0].innerHTML == "Child 1"
+        assert sliced[1].innerHTML == "Child 2"
+
+    def test_getitem_by_id(self):
+        """Test looking up descendant by id."""
+        child = web.p("Child", id="child-id")
+        parent = web.div(child)
+        web.page.body.append(parent)
+
+        result = parent["child-id"]
+        assert result is not None
+        assert result.id == "child-id"
+
+    def test_getitem_by_id_with_hash(self):
+        """Test looking up descendant by id with # prefix."""
+        child = web.p("Child", id="child-id-2")
+        parent = web.div(child)
+        web.page.body.append(parent)
+
+        result = parent["#child-id-2"]
+        assert result is not None
+        assert result.id == "child-id-2"
+
+    def test_clone_basic(self):
+        """Test cloning an element."""
+        original = web.div("Content", id="original")
+        original.classes.add("test-class")
+
+        clone = original.clone()
+        assert clone.innerHTML == original.innerHTML
+        assert "test-class" in clone.classes
+        assert clone is not original
+        assert clone._dom_element is not original._dom_element
+
+    def test_clone_with_id(self):
+        """Test cloning with new id."""
+        original = web.div("Content", id="original")
+        clone = original.clone(clone_id="cloned")
+        assert clone.id == "cloned"
+        assert original.id == "original"
+
+    def test_for_attribute(self):
+        """Test that for_ maps to htmlFor."""
+        label = web.label("Test", for_="input-id")
+        assert label.for_ == "input-id"
+        assert 'for="input-id"' in label.outerHTML
+
+    def test_trailing_underscore_removal(self):
+        """Test that trailing underscores are removed."""
+        div = web.div()
+        div.class_ = "test-class"
+        # Setting class_ should set the className, which affects classes
+        assert "test-class" in div.classes
+        assert div.className == "test-class"
+
+
+class TestContainerElement:
+    """Test ContainerElement specific functionality."""
+
+    def test_container_iteration(self):
+        """Test iterating over container's children."""
+        parent = web.div(web.p("1"), web.p("2"), web.p("3"))
+        children = list(parent)
+        assert len(children) == 3
+        assert children[0].innerHTML == "1"
+
+    def test_container_children_kwarg(self):
+        """Test creating container with children kwarg."""
+        parent = web.div(children=[web.p("1"), web.p("2")])
+        assert len(parent.children) == 2
+
+    def test_container_html_string(self):
+        """Test inserting HTML string as child."""
+        parent = web.div("<b>Bold text</b>")
+        assert "Bold text" in parent.innerHTML
+        assert "<b>" in parent.innerHTML
+
 
 class TestCollection:
 
@@ -260,24 +550,6 @@ class TestCollection:
             assert el == elements[i]
         assert elements[:] == elements
 
-    def test_style_rule(self):
-        selector = ".multi-elems"
-        elements = web.page.find(selector)
-        for el in elements:
-            assert el.style["background-color"] != "red"
-
-        elements.style["background-color"] = "red"
-
-        for i, el in enumerate(web.page.find(selector)):
-            assert elements[i].style["background-color"] == "red"
-            assert el.style["background-color"] == "red"
-
-        elements.style.remove("background-color")
-
-        for i, el in enumerate(web.page.find(selector)):
-            assert el.style["background-color"] != "red"
-            assert elements[i].style["background-color"] != "red"
-
     @upytest.skip(
         "Flakey in Pyodide on Worker",
         skip_when=RUNNING_IN_WORKER and not upytest.is_micropython,
@@ -286,7 +558,7 @@ class TestCollection:
         called = False
         call_flag = asyncio.Event()
 
-        buttons_collection = web.page["button"]
+        buttons_collection = web.page.find("button")
 
         @when("click", buttons_collection)
         def on_click(event):
@@ -304,27 +576,40 @@ class TestCollection:
             called = False
             call_flag.clear()
 
-    async def test_when_decorator_on_event(self):
-        call_counter = 0
-        call_flag = asyncio.Event()
+    def test_update_all_single_attribute(self):
+        """Test updating single attribute on all elements."""
+        div1 = web.div("Content 1")
+        div2 = web.div("Content 2")
+        collection = web.ElementCollection([div1, div2])
 
-        buttons_collection = web.page.find("button")
-        number_of_clicks = len(buttons_collection)
+        collection.update_all(className="updated")
+        assert div1.className == "updated"
+        assert div2.className == "updated"
 
-        @when(buttons_collection.on_click)
-        def on_click(event):
-            nonlocal call_counter
-            call_counter += 1
-            if call_counter == number_of_clicks:
-                call_flag.set()
+    def test_update_all_multiple_attributes(self):
+        """Test updating multiple attributes on all elements."""
+        div1 = web.div()
+        div2 = web.div()
+        collection = web.ElementCollection([div1, div2])
 
-        # Now let's simulate a click on the button (using the low level JS API)
-        # so we don't risk dom getting in the way
-        assert call_counter == 0
-        for button in buttons_collection:
-            button._dom_element.click()
-        await call_flag.wait()
-        assert call_counter == number_of_clicks
+        collection.update_all(innerHTML="Hello", title="Test")
+        assert div1.innerHTML == "Hello"
+        assert div1.title == "Test"
+        assert div2.innerHTML == "Hello"
+        assert div2.title == "Test"
+
+    def test_collection_getitem_by_id(self):
+        """Test looking up element by id in collection."""
+        div1 = web.div(web.p("Child", id="find-me"))
+        div2 = web.div(web.p("Child 2"))
+        collection = web.ElementCollection([div1, div2])
+
+        web.page.body.append(div1)
+        web.page.body.append(div2)
+
+        result = collection["find-me"]
+        assert result is not None
+        assert result.id == "find-me"
 
 
 class TestCreation:
@@ -376,8 +661,7 @@ class TestInput:
     def test_value(self):
         for id_ in self.input_ids:
             expected_type = id_.split("_")[-1]
-            result = web.page.find(f"#{id_}")
-            input_el = result[0]
+            input_el = web.page[f"#{id_}"]
             assert input_el._dom_element.type == expected_type
             assert (
                 input_el.value == f"Content {id_}" == input_el._dom_element.value
@@ -388,41 +672,6 @@ class TestInput:
             input_el.value = new_value
             assert input_el.value == new_value
 
-            # Check that we can set the value back to the original using
-            # the collection
-            new_value = f"Content {id_}"
-            result.value = new_value
-            assert input_el.value == new_value
-
-    def test_set_value_collection(self):
-        for id_ in self.input_ids:
-            input_el = web.page.find(f"#{id_}")
-
-            assert input_el.value[0] == f"Content {id_}" == input_el[0].value
-
-            new_value = f"New Value {id_}"
-            input_el.value = new_value
-            assert (
-                input_el.value[0] == new_value == input_el[0].value
-            ), f"Expected '{input_el.value}' to be 'Content {id_}' to be '{input_el._dom_element.value}'"
-
-            new_value = f"Content {id_}"
-            input_el.value = new_value
-
-    # TODO: We only attach attributes to the classes that have them now which means we
-    # would have to have some other way to help users if using attributes that aren't
-    # actually on the class. Maybe a job for  __setattr__?
-    #
-    # def test_element_without_value(self):
-    #     result = web.page.find(f"#tests-terminal"][0]
-    #     with upytest.raises(AttributeError):
-    #         result.value = "some value"
-    #
-    # def test_element_without_value_via_collection(self):
-    #     result = web.page.find(f"#tests-terminal"]
-    #     with upytest.raises(AttributeError):
-    #         result.value = "some value"
-
 
 class TestSelect:
 
@@ -532,7 +781,7 @@ class TestSelect:
 
     def test_select_options_remove(self):
         # GIVEN the existing select element with 3 options
-        select = web.page.find("#test_select_element_to_remove")[0]
+        select = web.page["#test_select_element_to_remove"]
 
         # EXPECT the select element to have 3 options
         assert len(select.options) == 4
@@ -610,7 +859,7 @@ class TestElements:
             kwargs = {k: parse_value(v) for k, v in properties.items()}
 
         # Let's make sure the target div to contain the element is empty.
-        container = web.page["#test-element-container"][0]
+        container = web.page["#test-element-container"]
         container.innerHTML = ""
         assert container.innerHTML == "", container.innerHTML
 
@@ -881,7 +1130,9 @@ class TestElements:
         assert el._dom_element.tagName == "LABEL"
         assert el.for_ == label_for, "The label should have the correct for attribute."
         # Ensure the label element is rendered with the correct "for" attribute
-        assert f'for="{label_for}"' in el.outerHTML, "The label should have the correct 'for' attribute in its HTML."
+        assert (
+            f'for="{label_for}"' in el.outerHTML
+        ), "The label should have the correct 'for' attribute in its HTML."
 
     def test_legend(self):
         self._create_el_and_basic_asserts("legend", "some text")
@@ -1195,3 +1446,58 @@ class TestElements:
         assert el.children[1].id == "child2"
         assert el.children[1].parentNode.textContent == parent_full_content
         assert el.children[1].textContent == p2_text_content
+
+
+class TestPageObject:
+    """Test the Page object."""
+
+    def test_page_getitem_with_id(self):
+        """Test looking up element by id using page[id]."""
+        result = web.page["test_id_selector"]
+        assert result is not None
+        assert result.id == "test_id_selector"
+
+    def test_page_getitem_with_hash(self):
+        """Test looking up element by id with # prefix."""
+        result = web.page["#test_id_selector"]
+        assert result is not None
+        assert result.id == "test_id_selector"
+
+    def test_page_getitem_nonexistent(self):
+        """Test looking up nonexistent id returns None."""
+        result = web.page["nonexistent-id"]
+        assert result is None
+
+    def test_page_title_get(self):
+        """Test getting page title."""
+        original_title = web.page.title
+        assert isinstance(original_title, str)
+
+    def test_page_title_set(self):
+        """Test setting page title."""
+        original = web.page.title
+        web.page.title = "Test Title"
+        assert web.page.title == "Test Title"
+        web.page.title = original  # Restore
+
+
+class TestErrorCases:
+    """Test error handling."""
+
+    def test_invalid_event_name(self):
+        """Test that invalid event names raise ValueError."""
+        div = web.div()
+        with upytest.raises(ValueError):
+            div.on_nonexistent_event
+
+    def test_invalid_append_type(self):
+        """Test that appending invalid types raises TypeError."""
+        div = web.div()
+        with upytest.raises(TypeError):
+            div.append(12345)  # Numbers can't be appended
+
+    def test_event_name_without_on_prefix(self):
+        """Test that get_event requires on_ prefix."""
+        div = web.div()
+        with upytest.raises(ValueError):
+            div.get_event("click")  # Should be "on_click"
diff --git a/core/tests/python/tests/test_websocket.py b/core/tests/python/tests/test_websocket.py
index 8561eab1..cd3fae8a 100644
--- a/core/tests/python/tests/test_websocket.py
+++ b/core/tests/python/tests/test_websocket.py
@@ -8,7 +8,13 @@ import upytest
 from pyscript import WebSocket
 
 
-@upytest.skip("Websocket tests are disabled.")
+# Websocket tests are disabled by default because they don't reliably work in
+# playwright based tests. Feel free to set this to False to enable them when
+# running tests locally in an actual browser (they all pass there).
+SKIP_WEBSOCKET_TESTS = True
+
+
+@upytest.skip("Websocket tests are disabled.", skip_when=SKIP_WEBSOCKET_TESTS)
 async def test_websocket_with_attributes():
     """
     Event handlers assigned via object attributes.
@@ -54,7 +60,7 @@ async def test_websocket_with_attributes():
     assert closed_flag is True
 
 
-@upytest.skip("Websocket tests are disabled.")
+@upytest.skip("Websocket tests are disabled.", skip_when=SKIP_WEBSOCKET_TESTS)
 async def test_websocket_with_init():
     """
     Event handlers assigned via __init__ arguments.
@@ -100,3 +106,174 @@ async def test_websocket_with_init():
     assert "request served by" in messages[0].lower()
     assert messages[1] == "Hello, world!"
     assert closed_flag is True
+
+
+@upytest.skip("Websocket tests are disabled.", skip_when=SKIP_WEBSOCKET_TESTS)
+async def test_websocket_async_handlers():
+    """
+    Async event handlers should work correctly.
+    """
+    messages = []
+    ready_to_test = asyncio.Event()
+
+    async def on_open(event):
+        await asyncio.sleep(0)
+        ws.send("async test")
+
+    async def on_message(event):
+        await asyncio.sleep(0)
+        messages.append(event.data)
+        if len(messages) == 2:
+            ws.close()
+
+    async def on_close(event):
+        await asyncio.sleep(0)
+        ready_to_test.set()
+
+    ws = WebSocket(
+        url="wss://echo.websocket.org",
+        onopen=on_open,
+        onmessage=on_message,
+        onclose=on_close,
+    )
+
+    await ready_to_test.wait()
+    assert len(messages) == 2
+    assert messages[1] == "async test"
+
+
+@upytest.skip("Websocket tests are disabled.", skip_when=SKIP_WEBSOCKET_TESTS)
+async def test_websocket_binary_data_conversion():
+    """
+    WebSocket should convert binary data to memoryview for Python.
+    """
+    messages = []
+    ready_to_test = asyncio.Event()
+
+    def on_open(event):
+        # Send binary data as bytearray.
+        binary_data = bytearray([0x48, 0x65, 0x6C, 0x6C, 0x6F])
+        ws.send(binary_data)
+
+    def on_message(event):
+        messages.append(event.data)
+        if len(messages) == 2:
+            ws.close()
+
+    def on_close(event):
+        ready_to_test.set()
+
+    ws = WebSocket(
+        url="wss://echo.websocket.org",
+        onopen=on_open,
+        onmessage=on_message,
+        onclose=on_close,
+    )
+
+    await ready_to_test.wait()
+    assert len(messages) == 2
+    # Verify wrapper converts binary to memoryview Python type.
+    assert isinstance(messages[1], memoryview)
+
+
+@upytest.skip("Websocket tests are disabled.", skip_when=SKIP_WEBSOCKET_TESTS)
+async def test_websocket_send_bytes_conversion():
+    """
+    WebSocket send should convert Python bytes to JS Uint8Array.
+    """
+    messages = []
+    ready_to_test = asyncio.Event()
+
+    def on_open(event):
+        # Test that bytes are converted properly.
+        ws.send(bytes([0x41, 0x42, 0x43]))
+
+    def on_message(event):
+        messages.append(event.data)
+        if len(messages) == 2:
+            ws.close()
+
+    def on_close(event):
+        ready_to_test.set()
+
+    ws = WebSocket(
+        url="wss://echo.websocket.org",
+        onopen=on_open,
+        onmessage=on_message,
+        onclose=on_close,
+    )
+
+    await ready_to_test.wait()
+    assert len(messages) == 2
+
+
+@upytest.skip("Websocket tests are disabled.", skip_when=SKIP_WEBSOCKET_TESTS)
+async def test_websocket_event_wrapper():
+    """
+    WebSocketEvent wrapper should provide access to event properties.
+    """
+    event_types = []
+    ready_to_test = asyncio.Event()
+
+    def on_open(event):
+        event_types.append(event.type)
+        ws.send("test")
+
+    def on_message(event):
+        event_types.append(event.type)
+        # Verify event wrapper exposes properties.
+        assert hasattr(event, "data")
+        assert hasattr(event, "type")
+        if len(event_types) >= 2:
+            ws.close()
+
+    def on_close(event):
+        event_types.append(event.type)
+        ready_to_test.set()
+
+    ws = WebSocket(
+        url="wss://echo.websocket.org",
+        onopen=on_open,
+        onmessage=on_message,
+        onclose=on_close,
+    )
+
+    await ready_to_test.wait()
+    assert "open" in event_types
+    assert "message" in event_types
+    assert "close" in event_types
+
+
+@upytest.skip("Websocket tests are disabled.", skip_when=SKIP_WEBSOCKET_TESTS)
+async def test_websocket_reassign_handler():
+    """
+    Event handlers should be replaceable after creation.
+    """
+    first_handler_called = False
+    second_handler_called = False
+    ready_to_test = asyncio.Event()
+
+    def first_handler(event):
+        nonlocal first_handler_called
+        first_handler_called = True
+
+    def second_handler(event):
+        nonlocal second_handler_called
+        second_handler_called = True
+        ws.close()
+
+    def on_open(event):
+        # Replace the message handler before any messages arrive.
+        ws.onmessage = second_handler
+        ws.send("test")
+
+    def on_close(event):
+        ready_to_test.set()
+
+    ws = WebSocket(url="wss://echo.websocket.org", onopen=on_open, onclose=on_close)
+    ws.onmessage = first_handler
+
+    await ready_to_test.wait()
+    # Verify that handler replacement worked.
+    assert first_handler_called is False
+    assert second_handler_called is True
diff --git a/core/tests/python/tests/test_workers.py b/core/tests/python/tests/test_workers.py
new file mode 100644
index 00000000..988d4afb
--- /dev/null
+++ b/core/tests/python/tests/test_workers.py
@@ -0,0 +1,105 @@
+"""
+Tests for the pyscript.workers module.
+
+Note: These tests can only run in the main thread since they test worker
+creation and access.
+
+I've added the import of workers and create_named_worker inside each test
+so that the test module can still be imported in a worker context without
+errors. It also means the module is GC'd between tests, which is a good way
+to ensure each test is independent given the global nature of the workers
+proxy.
+"""
+
+import upytest
+from pyscript import RUNNING_IN_WORKER
+
+
+@upytest.skip("Main thread only", skip_when=RUNNING_IN_WORKER)
+async def test_workers_proxy_exists():
+    """
+    The workers proxy should be accessible and support both.
+    bracket and dot notation.
+    """
+    from pyscript import workers
+
+    assert workers is not None
+    # Defined in the HTML.
+    worker = await workers["testworker"]
+    assert worker is not None
+    worker = await workers.testworker
+    assert worker is not None
+
+
+@upytest.skip("Main thread only", skip_when=RUNNING_IN_WORKER)
+async def test_worker_exported_functions():
+    """
+    Functions exported from a worker should be callable.
+    """
+    from pyscript import workers
+
+    worker = await workers["testworker"]
+    # Test multiple exported functions.
+    add_result = await worker.add(10, 20)
+    multiply_result = await worker.multiply(4, 5)
+    greeting = await worker.get_message()
+
+    assert add_result == 30
+    assert multiply_result == 20
+    assert greeting == "Hello from worker"
+
+
+@upytest.skip("Main thread only", skip_when=RUNNING_IN_WORKER)
+async def test_create_named_worker_basic():
+    """
+    Creating a named worker dynamically should work.
+    """
+    from pyscript import create_named_worker, workers
+
+    worker = await create_named_worker(
+        src="./worker_functions.py", name="dynamic-test-worker"
+    )
+
+    assert worker is not None
+    # Verify we can call its functions.
+    result = await worker.add(1, 2)
+    assert result == 3
+    # Verify it's also accessible via the workers proxy.
+    same_worker = await workers["dynamic-test-worker"]
+    result2 = await same_worker.add(3, 4)
+    assert result2 == 7
+
+
+@upytest.skip("Main thread only", skip_when=RUNNING_IN_WORKER)
+async def test_create_named_worker_with_config():
+    """
+    Creating a worker with configuration should work.
+    """
+    from pyscript import create_named_worker
+
+    # Create worker with a PyScript configuration dict.
+    worker = await create_named_worker(
+        src="./worker_functions.py",
+        name="configured-worker",
+        config={"packages_cache": "never"},
+    )
+    assert worker is not None
+    # Worker should still function normally.
+    result = await worker.multiply(6, 7)
+    assert result == 42
+
+
+@upytest.skip("Main thread only", skip_when=RUNNING_IN_WORKER)
+async def test_create_named_worker_micropython():
+    """
+    Creating a MicroPython worker should work.
+    """
+    from pyscript import create_named_worker
+
+    worker = await create_named_worker(
+        src="./worker_functions.py", name="mpy-worker", type="mpy"
+    )
+    assert worker is not None
+    # Verify functionality.
+    result = await worker.add(100, 200)
+    assert result == 300
diff --git a/core/tests/python/worker_functions.py b/core/tests/python/worker_functions.py
new file mode 100644
index 00000000..1f695c61
--- /dev/null
+++ b/core/tests/python/worker_functions.py
@@ -0,0 +1,18 @@
+"""
+Numpty test code to run in a worker for pyscript.workers module tests.
+"""
+
+
+def add(a, b):
+    return a + b
+
+
+def multiply(a, b):
+    return a * b
+
+
+def get_message():
+    return "Hello from worker"
+
+
+__export__ = ["add", "multiply", "get_message"]
diff --git a/core/types/stdlib/pyscript.d.ts b/core/types/stdlib/pyscript.d.ts
index 8c6c476d..ab62d124 100644
--- a/core/types/stdlib/pyscript.d.ts
+++ b/core/types/stdlib/pyscript.d.ts
@@ -7,7 +7,7 @@ declare namespace _default {
         "ffi.py": string;
         "flatted.py": string;
         "fs.py": string;
-        "magic_js.py": string;
+        "context.py": string;
         "media.py": string;
         "storage.py": string;
         "util.py": string;
diff --git a/pyproject.toml b/pyproject.toml
index be1d3069..60d2d6fc 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -5,5 +5,5 @@ skip = "*.js,*.json"
 [tool.ruff]
 line-length = 114
 lint.select = ["C4", "C90", "E", "EM", "F", "PIE", "PYI", "PLC", "Q", "RET", "W"]
-lint.ignore = ["E402", "E722", "E731", "E741", "F401", "F704", "PLC0415"]
+lint.ignore = ["E402", "E722", "E731", "E741", "F401", "F704", "PLC0415", "EM101", "EM102", "RET505"]
 lint.mccabe.max-complexity = 27
diff --git a/requirements.txt b/requirements.txt
index c76bb6c4..265d1384 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
 black==24.10.0
 pre-commit==3.7.1
-python-minifier==2.11.0
+python-minifier==3.1.0
 setuptools==72.1.0