diff --git a/src/browser/tests/element/attributes.html b/src/browser/tests/element/attributes.html
index 56f6ef83..a493242e 100644
--- a/src/browser/tests/element/attributes.html
+++ b/src/browser/tests/element/attributes.html
@@ -57,6 +57,7 @@
     for (let i = 0; i < expected.length; i++) {
       const ex = expected[i];
       let attribute = attributes[ex.name];
+      testing.expectEqual('[object Attr]', attribute.toString());
       testing.expectEqual(ex.name, attribute.name)
       testing.expectEqual(ex.value, attribute.value)
 
@@ -246,3 +247,22 @@
   }, () => div.toggleAttribute('-invalid'));
 }
 </script>
+
+<div id=legacy></a>
+<script id=legacy>
+  {
+    let a = document.getElementById('legacy').attributes;
+    testing.expectEqual(1, a.length);
+    testing.expectEqual('[object Attr]', a.item(0).toString());
+    testing.expectEqual(null, a.item(1));
+    testing.expectEqual('[object Attr]', a.getNamedItem('id').toString());
+    testing.expectEqual(null, a.getNamedItem('foo'));
+    testing.expectEqual('[object Attr]', a.setNamedItem(a.getNamedItem('id')).toString());
+
+    testing.expectEqual('id', a['id'].name);
+    testing.expectEqual('legacy', a['id'].value);
+    testing.expectEqual(undefined, a['other']);
+    a[0].value = 'abc123';
+    testing.expectEqual('abc123', a[0].value);
+  }
+</script>
diff --git a/src/browser/tests/event/keyboard.html b/src/browser/tests/event/keyboard.html
index 3d14cfca..54419903 100644
--- a/src/browser/tests/event/keyboard.html
+++ b/src/browser/tests/event/keyboard.html
@@ -32,6 +32,7 @@
   testing.expectEqual(true, event.getModifierState("Control"));
   testing.expectEqual(true, event.getModifierState("Shift"));
   testing.expectEqual(true, event.getModifierState("Meta"));
+  testing.expectEqual(true, event.getModifierState("Accel"));
 </script>
 
 <script id=keyDownListener>
diff --git a/src/browser/tests/legacy/events/keyboard.html b/src/browser/tests/legacy/events/keyboard.html
index 2b3dbefb..e76de57f 100644
--- a/src/browser/tests/legacy/events/keyboard.html
+++ b/src/browser/tests/legacy/events/keyboard.html
@@ -32,7 +32,7 @@
   testing.expectEqual(true, event.getModifierState("Control"));
   testing.expectEqual(true, event.getModifierState("Shift"));
   testing.expectEqual(true, event.getModifierState("Meta"));
-  testing.expectEqual(true, event.getModifierState("OS"));
+  testing.expectEqual(false, event.getModifierState("OS"));
   testing.expectEqual(true, event.getModifierState("Accel"));
 </script>
 
diff --git a/src/browser/tests/legacy/events/mouse.html b/src/browser/tests/legacy/events/mouse.html
index 4c9b3f63..230bf188 100644
--- a/src/browser/tests/legacy/events/mouse.html
+++ b/src/browser/tests/legacy/events/mouse.html
@@ -16,8 +16,8 @@
   testing.expectEqual(0, new_event.button);
   testing.expectEqual(10, new_event.x);
   testing.expectEqual(20, new_event.y);
-  testing.expectEqual(10, new_event.screenX);
-  testing.expectEqual(20, new_event.screenY);
+  testing.expectEqual(0, new_event.screenX);
+  testing.expectEqual(0, new_event.screenY);
 </script>
 
 <script id=listener>
diff --git a/src/browser/webapi/element/Attribute.zig b/src/browser/webapi/element/Attribute.zig
index 693b3842..ca9e3fb3 100644
--- a/src/browser/webapi/element/Attribute.zig
+++ b/src/browser/webapi/element/Attribute.zig
@@ -46,7 +46,7 @@ pub fn format(self: *const Attribute, writer: *std.Io.Writer) !void {
 }
 
 pub fn className(_: *const Attribute) []const u8 {
-    return "Attr";
+    return "[object Attr]";
 }
 
 pub fn getName(self: *const Attribute) []const u8 {
@@ -60,13 +60,13 @@ pub fn getValue(self: *const Attribute) []const u8 {
 pub fn setValue(self: *Attribute, data_: ?[]const u8, page: *Page) !void {
     const data = data_ orelse "";
     const el = self._element orelse {
-        self._value = try page.arena.dupe(u8, data);
+        self._value = try page.dupeString(data);
         return;
     };
     // this takes ownership of the data
     try el.setAttribute(self._name, data, page);
 
-    // not the most efficient, but we don't expect this to be called oftens
+    // not the most efficient, but we don't expect this to be called often
     self._value = (try el.getAttribute(self._name, page)) orelse "";
 }
 
@@ -97,7 +97,7 @@ pub const JsApi = struct {
 
     pub const name = bridge.accessor(Attribute.getName, null, .{});
     pub const localName = bridge.accessor(Attribute.getName, null, .{});
-    pub const value = bridge.accessor(Attribute.getValue, null, .{});
+    pub const value = bridge.accessor(Attribute.getValue, Attribute.setValue, .{});
     pub const namespaceURI = bridge.accessor(Attribute.getNamespaceURI, null, .{});
     pub const ownerElement = bridge.accessor(Attribute.getOwnerElement, null, .{});
 };
@@ -447,7 +447,7 @@ pub const NamedNodeMap = struct {
 
     // Whenever the NamedNodeMap creates an Attribute, it needs to provide the
     // "ownerElement".
-    _element: ?*Element = null,
+    _element: *Element,
 
     pub fn length(self: *const NamedNodeMap) u32 {
         return @intCast(self._list._list.len());
@@ -477,6 +477,11 @@ pub const NamedNodeMap = struct {
         return self._list.getAttribute(name, self._element, page);
     }
 
+    pub fn setByName(self: *const NamedNodeMap, attribute: *Attribute, page: *Page) !?*Attribute {
+        attribute._element = null; // just a requirement of list.putAttribute, it'll re-set it.
+        return self._list.putAttribute(attribute, self._element, page);
+    }
+
     pub fn iterator(self: *const NamedNodeMap, page: *Page) !*Iterator {
         return .init(.{ .list = self }, page);
     }
@@ -505,6 +510,7 @@ pub const NamedNodeMap = struct {
         pub const @"[int]" = bridge.indexed(NamedNodeMap.getAtIndex, .{ .null_as_undefined = true });
         pub const @"[str]" = bridge.namedIndexed(NamedNodeMap.getByName, null, null, .{ .null_as_undefined = true });
         pub const getNamedItem = bridge.function(NamedNodeMap.getByName, .{});
+        pub const setNamedItem = bridge.function(NamedNodeMap.setByName, .{});
         pub const item = bridge.function(_item, .{});
         fn _item(self: *const NamedNodeMap, index: i32, page: *Page) !?*Attribute {
             // the bridge.indexed handles this, so if we want
diff --git a/src/browser/webapi/event/KeyboardEvent.zig b/src/browser/webapi/event/KeyboardEvent.zig
index 80ae94b8..eaa04e64 100644
--- a/src/browser/webapi/event/KeyboardEvent.zig
+++ b/src/browser/webapi/event/KeyboardEvent.zig
@@ -177,7 +177,7 @@ pub const KeyboardEventOptions = struct {
     metaKey: bool = false,
 };
 
-pub const Options = Event.inheritOptions(
+const Options = Event.inheritOptions(
     KeyboardEvent,
     KeyboardEventOptions,
 );
@@ -253,8 +253,12 @@ pub fn getModifierState(self: *const KeyboardEvent, str: []const u8, page: *Page
         .Shift => return self._shift_key,
         .Control => return self._ctrl_key,
         .Meta => return self._meta_key,
-        else => return false,
+        .standard => |s| if (std.mem.eql(u8, s, "Accel")) {
+            return self._ctrl_key or self._meta_key;
+        },
+        else => {},
     }
+    return false;
 }
 
 pub const JsApi = struct {
diff --git a/src/browser/webapi/event/MouseEvent.zig b/src/browser/webapi/event/MouseEvent.zig
index 305d4c86..50d5f879 100644
--- a/src/browser/webapi/event/MouseEvent.zig
+++ b/src/browser/webapi/event/MouseEvent.zig
@@ -63,7 +63,7 @@ pub const MouseEventOptions = struct {
     relatedTarget: ?*EventTarget = null,
 };
 
-pub const Options = Event.inheritOptions(
+const Options = Event.inheritOptions(
     MouseEvent,
     MouseEventOptions,
 );