diff --git a/src/java/com/threerings/micasa/lobby/LobbyDispatcher.java b/src/java/com/threerings/micasa/lobby/LobbyDispatcher.java
index 058a356f..55d66fe4 100644
--- a/src/java/com/threerings/micasa/lobby/LobbyDispatcher.java
+++ b/src/java/com/threerings/micasa/lobby/LobbyDispatcher.java
@@ -1,9 +1,9 @@
 //
-// $Id: LobbyDispatcher.java 4145 2006-05-24 01:24:24Z ray $
+// $Id$
 //
-// Narya library - tools for developing networked games
+// Vilya library - tools for developing networked games
 // Copyright (C) 2002-2006 Three Rings Design, Inc., All Rights Reserved
-// http://www.threerings.net/code/narya/
+// http://www.threerings.net/code/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it
 // under the terms of the GNU Lesser General Public License as published
@@ -44,13 +44,13 @@ public class LobbyDispatcher extends InvocationDispatcher
         this.provider = provider;
     }
 
-    // documentation inherited
+    // from InvocationDispatcher
     public InvocationMarshaller createMarshaller ()
     {
         return new LobbyMarshaller();
     }
 
-    // documentation inherited
+    @SuppressWarnings("unchecked") // from InvocationDispatcher
     public void dispatchRequest (
         ClientObject source, int methodId, Object[] args)
         throws InvocationException
diff --git a/src/java/com/threerings/micasa/lobby/LobbyMarshaller.java b/src/java/com/threerings/micasa/lobby/LobbyMarshaller.java
index efbf229c..c736a510 100644
--- a/src/java/com/threerings/micasa/lobby/LobbyMarshaller.java
+++ b/src/java/com/threerings/micasa/lobby/LobbyMarshaller.java
@@ -1,9 +1,9 @@
 //
-// $Id: LobbyMarshaller.java 4145 2006-05-24 01:24:24Z ray $
+// $Id$
 //
-// Narya library - tools for developing networked games
+// Vilya library - tools for developing networked games
 // Copyright (C) 2002-2006 Three Rings Design, Inc., All Rights Reserved
-// http://www.threerings.net/code/narya/
+// http://www.threerings.net/code/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it
 // under the terms of the GNU Lesser General Public License as published
diff --git a/src/java/com/threerings/micasa/lobby/LobbyProvider.java b/src/java/com/threerings/micasa/lobby/LobbyProvider.java
index 8e268475..94ace54a 100644
--- a/src/java/com/threerings/micasa/lobby/LobbyProvider.java
+++ b/src/java/com/threerings/micasa/lobby/LobbyProvider.java
@@ -1,9 +1,9 @@
 //
-// $Id: LobbyProvider.java 4145 2006-05-24 01:24:24Z ray $
+// $Id$
 //
-// Narya library - tools for developing networked games
+// Vilya library - tools for developing networked games
 // Copyright (C) 2002-2006 Three Rings Design, Inc., All Rights Reserved
-// http://www.threerings.net/code/narya/
+// http://www.threerings.net/code/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it
 // under the terms of the GNU Lesser General Public License as published
diff --git a/src/java/com/threerings/micasa/lobby/table/TableLobbyObject.java b/src/java/com/threerings/micasa/lobby/table/TableLobbyObject.java
index 0858d290..0526d1e2 100644
--- a/src/java/com/threerings/micasa/lobby/table/TableLobbyObject.java
+++ b/src/java/com/threerings/micasa/lobby/table/TableLobbyObject.java
@@ -105,7 +105,9 @@ public class TableLobbyObject
     public void setTableSet (DSet value)
     {
         requestAttributeChange(TABLE_SET, value, this.tableSet);
-        this.tableSet = (value == null) ? null : value.typedClone();
+        @SuppressWarnings("unchecked") DSet clone =
+            (value == null) ? null : value.typedClone();
+        this.tableSet = clone;
     }
     // AUTO-GENERATED: METHODS END
 }
diff --git a/src/java/com/threerings/micasa/simulator/data/SimulatorMarshaller.java b/src/java/com/threerings/micasa/simulator/data/SimulatorMarshaller.java
index 60a49177..0975e43b 100644
--- a/src/java/com/threerings/micasa/simulator/data/SimulatorMarshaller.java
+++ b/src/java/com/threerings/micasa/simulator/data/SimulatorMarshaller.java
@@ -1,9 +1,9 @@
 //
-// $Id: SimulatorMarshaller.java 4145 2006-05-24 01:24:24Z ray $
+// $Id$
 //
-// Narya library - tools for developing networked games
+// Vilya library - tools for developing networked games
 // Copyright (C) 2002-2006 Three Rings Design, Inc., All Rights Reserved
-// http://www.threerings.net/code/narya/
+// http://www.threerings.net/code/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it
 // under the terms of the GNU Lesser General Public License as published
diff --git a/src/java/com/threerings/micasa/simulator/server/SimulatorDispatcher.java b/src/java/com/threerings/micasa/simulator/server/SimulatorDispatcher.java
index ff338599..64ba65bb 100644
--- a/src/java/com/threerings/micasa/simulator/server/SimulatorDispatcher.java
+++ b/src/java/com/threerings/micasa/simulator/server/SimulatorDispatcher.java
@@ -1,9 +1,9 @@
 //
-// $Id: SimulatorDispatcher.java 4145 2006-05-24 01:24:24Z ray $
+// $Id$
 //
-// Narya library - tools for developing networked games
+// Vilya library - tools for developing networked games
 // Copyright (C) 2002-2006 Three Rings Design, Inc., All Rights Reserved
-// http://www.threerings.net/code/narya/
+// http://www.threerings.net/code/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it
 // under the terms of the GNU Lesser General Public License as published
@@ -44,13 +44,13 @@ public class SimulatorDispatcher extends InvocationDispatcher
         this.provider = provider;
     }
 
-    // documentation inherited
+    // from InvocationDispatcher
     public InvocationMarshaller createMarshaller ()
     {
         return new SimulatorMarshaller();
     }
 
-    // documentation inherited
+    @SuppressWarnings("unchecked") // from InvocationDispatcher
     public void dispatchRequest (
         ClientObject source, int methodId, Object[] args)
         throws InvocationException
diff --git a/src/java/com/threerings/parlor/card/client/CardGameDecoder.java b/src/java/com/threerings/parlor/card/client/CardGameDecoder.java
index ab05fcfe..a208badc 100644
--- a/src/java/com/threerings/parlor/card/client/CardGameDecoder.java
+++ b/src/java/com/threerings/parlor/card/client/CardGameDecoder.java
@@ -1,9 +1,9 @@
 //
 // $Id$
 //
-// Narya library - tools for developing networked games
+// Vilya library - tools for developing networked games
 // Copyright (C) 2002-2006 Three Rings Design, Inc., All Rights Reserved
-// http://www.threerings.net/code/narya/
+// http://www.threerings.net/code/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it
 // under the terms of the GNU Lesser General Public License as published
diff --git a/src/java/com/threerings/parlor/card/server/CardGameSender.java b/src/java/com/threerings/parlor/card/server/CardGameSender.java
index 6ad718b6..e9db3552 100644
--- a/src/java/com/threerings/parlor/card/server/CardGameSender.java
+++ b/src/java/com/threerings/parlor/card/server/CardGameSender.java
@@ -1,9 +1,9 @@
 //
 // $Id$
 //
-// Narya library - tools for developing networked games
+// Vilya library - tools for developing networked games
 // Copyright (C) 2002-2006 Three Rings Design, Inc., All Rights Reserved
-// http://www.threerings.net/code/narya/
+// http://www.threerings.net/code/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it
 // under the terms of the GNU Lesser General Public License as published
diff --git a/src/java/com/threerings/parlor/card/trick/data/TrickCardGameMarshaller.java b/src/java/com/threerings/parlor/card/trick/data/TrickCardGameMarshaller.java
index d03a8fed..c66cbe07 100644
--- a/src/java/com/threerings/parlor/card/trick/data/TrickCardGameMarshaller.java
+++ b/src/java/com/threerings/parlor/card/trick/data/TrickCardGameMarshaller.java
@@ -1,9 +1,9 @@
 //
 // $Id$
 //
-// Narya library - tools for developing networked games
+// Vilya library - tools for developing networked games
 // Copyright (C) 2002-2006 Three Rings Design, Inc., All Rights Reserved
-// http://www.threerings.net/code/narya/
+// http://www.threerings.net/code/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it
 // under the terms of the GNU Lesser General Public License as published
diff --git a/src/java/com/threerings/parlor/card/trick/server/TrickCardGameDispatcher.java b/src/java/com/threerings/parlor/card/trick/server/TrickCardGameDispatcher.java
index 17655c83..4fa02baa 100644
--- a/src/java/com/threerings/parlor/card/trick/server/TrickCardGameDispatcher.java
+++ b/src/java/com/threerings/parlor/card/trick/server/TrickCardGameDispatcher.java
@@ -1,9 +1,9 @@
 //
 // $Id$
 //
-// Narya library - tools for developing networked games
+// Vilya library - tools for developing networked games
 // Copyright (C) 2002-2006 Three Rings Design, Inc., All Rights Reserved
-// http://www.threerings.net/code/narya/
+// http://www.threerings.net/code/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it
 // under the terms of the GNU Lesser General Public License as published
@@ -44,13 +44,13 @@ public class TrickCardGameDispatcher extends InvocationDispatcher
         this.provider = provider;
     }
 
-    // documentation inherited
+    // from InvocationDispatcher
     public InvocationMarshaller createMarshaller ()
     {
         return new TrickCardGameMarshaller();
     }
 
-    // documentation inherited
+    @SuppressWarnings("unchecked") // from InvocationDispatcher
     public void dispatchRequest (
         ClientObject source, int methodId, Object[] args)
         throws InvocationException
diff --git a/src/java/com/threerings/parlor/card/trick/server/TrickCardGameProvider.java b/src/java/com/threerings/parlor/card/trick/server/TrickCardGameProvider.java
index 783f8ccc..c6fa7a4e 100644
--- a/src/java/com/threerings/parlor/card/trick/server/TrickCardGameProvider.java
+++ b/src/java/com/threerings/parlor/card/trick/server/TrickCardGameProvider.java
@@ -1,9 +1,9 @@
 //
 // $Id$
 //
-// Narya library - tools for developing networked games
+// Vilya library - tools for developing networked games
 // Copyright (C) 2002-2006 Three Rings Design, Inc., All Rights Reserved
-// http://www.threerings.net/code/narya/
+// http://www.threerings.net/code/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it
 // under the terms of the GNU Lesser General Public License as published
diff --git a/src/java/com/threerings/parlor/client/ParlorDecoder.java b/src/java/com/threerings/parlor/client/ParlorDecoder.java
index 093c716e..f0fc8aaf 100644
--- a/src/java/com/threerings/parlor/client/ParlorDecoder.java
+++ b/src/java/com/threerings/parlor/client/ParlorDecoder.java
@@ -1,9 +1,9 @@
 //
-// $Id: ParlorDecoder.java 4145 2006-05-24 01:24:24Z ray $
+// $Id$
 //
-// Narya library - tools for developing networked games
+// Vilya library - tools for developing networked games
 // Copyright (C) 2002-2006 Three Rings Design, Inc., All Rights Reserved
-// http://www.threerings.net/code/narya/
+// http://www.threerings.net/code/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it
 // under the terms of the GNU Lesser General Public License as published
diff --git a/src/java/com/threerings/parlor/data/ParlorMarshaller.java b/src/java/com/threerings/parlor/data/ParlorMarshaller.java
index 29c87e08..2232ee16 100644
--- a/src/java/com/threerings/parlor/data/ParlorMarshaller.java
+++ b/src/java/com/threerings/parlor/data/ParlorMarshaller.java
@@ -1,9 +1,9 @@
 //
-// $Id: ParlorMarshaller.java 4145 2006-05-24 01:24:24Z ray $
+// $Id$
 //
-// Narya library - tools for developing networked games
+// Vilya library - tools for developing networked games
 // Copyright (C) 2002-2006 Three Rings Design, Inc., All Rights Reserved
-// http://www.threerings.net/code/narya/
+// http://www.threerings.net/code/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it
 // under the terms of the GNU Lesser General Public License as published
diff --git a/src/java/com/threerings/parlor/server/ParlorDispatcher.java b/src/java/com/threerings/parlor/server/ParlorDispatcher.java
index 28e42006..0008914d 100644
--- a/src/java/com/threerings/parlor/server/ParlorDispatcher.java
+++ b/src/java/com/threerings/parlor/server/ParlorDispatcher.java
@@ -1,9 +1,9 @@
 //
-// $Id: ParlorDispatcher.java 4145 2006-05-24 01:24:24Z ray $
+// $Id$
 //
-// Narya library - tools for developing networked games
+// Vilya library - tools for developing networked games
 // Copyright (C) 2002-2006 Three Rings Design, Inc., All Rights Reserved
-// http://www.threerings.net/code/narya/
+// http://www.threerings.net/code/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it
 // under the terms of the GNU Lesser General Public License as published
@@ -47,13 +47,13 @@ public class ParlorDispatcher extends InvocationDispatcher
         this.provider = provider;
     }
 
-    // documentation inherited
+    // from InvocationDispatcher
     public InvocationMarshaller createMarshaller ()
     {
         return new ParlorMarshaller();
     }
 
-    // documentation inherited
+    @SuppressWarnings("unchecked") // from InvocationDispatcher
     public void dispatchRequest (
         ClientObject source, int methodId, Object[] args)
         throws InvocationException
diff --git a/src/java/com/threerings/parlor/server/ParlorSender.java b/src/java/com/threerings/parlor/server/ParlorSender.java
index 9af4655b..da110bd1 100644
--- a/src/java/com/threerings/parlor/server/ParlorSender.java
+++ b/src/java/com/threerings/parlor/server/ParlorSender.java
@@ -1,9 +1,9 @@
 //
-// $Id: ParlorSender.java 4145 2006-05-24 01:24:24Z ray $
+// $Id$
 //
-// Narya library - tools for developing networked games
+// Vilya library - tools for developing networked games
 // Copyright (C) 2002-2006 Three Rings Design, Inc., All Rights Reserved
-// http://www.threerings.net/code/narya/
+// http://www.threerings.net/code/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it
 // under the terms of the GNU Lesser General Public License as published
diff --git a/src/java/com/threerings/puzzle/data/PuzzleGameMarshaller.java b/src/java/com/threerings/puzzle/data/PuzzleGameMarshaller.java
index 42b04e73..97fea641 100644
--- a/src/java/com/threerings/puzzle/data/PuzzleGameMarshaller.java
+++ b/src/java/com/threerings/puzzle/data/PuzzleGameMarshaller.java
@@ -1,9 +1,9 @@
 //
-// $Id: PuzzleGameMarshaller.java 4145 2006-05-24 01:24:24Z ray $
+// $Id$
 //
-// Narya library - tools for developing networked games
+// Vilya library - tools for developing networked games
 // Copyright (C) 2002-2006 Three Rings Design, Inc., All Rights Reserved
-// http://www.threerings.net/code/narya/
+// http://www.threerings.net/code/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it
 // under the terms of the GNU Lesser General Public License as published
diff --git a/src/java/com/threerings/puzzle/server/PuzzleGameDispatcher.java b/src/java/com/threerings/puzzle/server/PuzzleGameDispatcher.java
index d44a6a31..1b68a21d 100644
--- a/src/java/com/threerings/puzzle/server/PuzzleGameDispatcher.java
+++ b/src/java/com/threerings/puzzle/server/PuzzleGameDispatcher.java
@@ -1,9 +1,9 @@
 //
-// $Id: PuzzleGameDispatcher.java 4145 2006-05-24 01:24:24Z ray $
+// $Id$
 //
-// Narya library - tools for developing networked games
+// Vilya library - tools for developing networked games
 // Copyright (C) 2002-2006 Three Rings Design, Inc., All Rights Reserved
-// http://www.threerings.net/code/narya/
+// http://www.threerings.net/code/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it
 // under the terms of the GNU Lesser General Public License as published
@@ -44,13 +44,13 @@ public class PuzzleGameDispatcher extends InvocationDispatcher
         this.provider = provider;
     }
 
-    // documentation inherited
+    // from InvocationDispatcher
     public InvocationMarshaller createMarshaller ()
     {
         return new PuzzleGameMarshaller();
     }
 
-    // documentation inherited
+    @SuppressWarnings("unchecked") // from InvocationDispatcher
     public void dispatchRequest (
         ClientObject source, int methodId, Object[] args)
         throws InvocationException
diff --git a/src/java/com/threerings/puzzle/server/PuzzleGameProvider.java b/src/java/com/threerings/puzzle/server/PuzzleGameProvider.java
index bb25da0e..77cf9cca 100644
--- a/src/java/com/threerings/puzzle/server/PuzzleGameProvider.java
+++ b/src/java/com/threerings/puzzle/server/PuzzleGameProvider.java
@@ -1,9 +1,9 @@
 //
-// $Id: PuzzleGameProvider.java 4145 2006-05-24 01:24:24Z ray $
+// $Id$
 //
-// Narya library - tools for developing networked games
+// Vilya library - tools for developing networked games
 // Copyright (C) 2002-2006 Three Rings Design, Inc., All Rights Reserved
-// http://www.threerings.net/code/narya/
+// http://www.threerings.net/code/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it
 // under the terms of the GNU Lesser General Public License as published
diff --git a/src/java/com/threerings/stage/data/StageSceneMarshaller.java b/src/java/com/threerings/stage/data/StageSceneMarshaller.java
index 5e85b9a6..ce29dc69 100644
--- a/src/java/com/threerings/stage/data/StageSceneMarshaller.java
+++ b/src/java/com/threerings/stage/data/StageSceneMarshaller.java
@@ -1,9 +1,9 @@
 //
 // $Id$
 //
-// Narya library - tools for developing networked games
+// Vilya library - tools for developing networked games
 // Copyright (C) 2002-2006 Three Rings Design, Inc., All Rights Reserved
-// http://www.threerings.net/code/narya/
+// http://www.threerings.net/code/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it
 // under the terms of the GNU Lesser General Public License as published
diff --git a/src/java/com/threerings/stage/server/StageSceneDispatcher.java b/src/java/com/threerings/stage/server/StageSceneDispatcher.java
index bfe10799..31e47234 100644
--- a/src/java/com/threerings/stage/server/StageSceneDispatcher.java
+++ b/src/java/com/threerings/stage/server/StageSceneDispatcher.java
@@ -1,9 +1,9 @@
 //
 // $Id$
 //
-// Narya library - tools for developing networked games
+// Vilya library - tools for developing networked games
 // Copyright (C) 2002-2006 Three Rings Design, Inc., All Rights Reserved
-// http://www.threerings.net/code/narya/
+// http://www.threerings.net/code/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it
 // under the terms of the GNU Lesser General Public License as published
@@ -45,13 +45,13 @@ public class StageSceneDispatcher extends InvocationDispatcher
         this.provider = provider;
     }
 
-    // documentation inherited
+    // from InvocationDispatcher
     public InvocationMarshaller createMarshaller ()
     {
         return new StageSceneMarshaller();
     }
 
-    // documentation inherited
+    @SuppressWarnings("unchecked") // from InvocationDispatcher
     public void dispatchRequest (
         ClientObject source, int methodId, Object[] args)
         throws InvocationException
diff --git a/src/java/com/threerings/stage/server/StageSceneProvider.java b/src/java/com/threerings/stage/server/StageSceneProvider.java
index 4e4cc6b1..fa5c2dd6 100644
--- a/src/java/com/threerings/stage/server/StageSceneProvider.java
+++ b/src/java/com/threerings/stage/server/StageSceneProvider.java
@@ -1,9 +1,9 @@
 //
 // $Id$
 //
-// Narya library - tools for developing networked games
+// Vilya library - tools for developing networked games
 // Copyright (C) 2002-2006 Three Rings Design, Inc., All Rights Reserved
-// http://www.threerings.net/code/narya/
+// http://www.threerings.net/code/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it
 // under the terms of the GNU Lesser General Public License as published
diff --git a/src/java/com/threerings/whirled/client/SceneDecoder.java b/src/java/com/threerings/whirled/client/SceneDecoder.java
index 7e4c65e0..f8e60a72 100644
--- a/src/java/com/threerings/whirled/client/SceneDecoder.java
+++ b/src/java/com/threerings/whirled/client/SceneDecoder.java
@@ -1,9 +1,9 @@
 //
-// $Id: SceneDecoder.java 4145 2006-05-24 01:24:24Z ray $
+// $Id$
 //
-// Narya library - tools for developing networked games
+// Vilya library - tools for developing networked games
 // Copyright (C) 2002-2006 Three Rings Design, Inc., All Rights Reserved
-// http://www.threerings.net/code/narya/
+// http://www.threerings.net/code/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it
 // under the terms of the GNU Lesser General Public License as published
diff --git a/src/java/com/threerings/whirled/data/SceneMarshaller.java b/src/java/com/threerings/whirled/data/SceneMarshaller.java
index adfa85e6..a082b360 100644
--- a/src/java/com/threerings/whirled/data/SceneMarshaller.java
+++ b/src/java/com/threerings/whirled/data/SceneMarshaller.java
@@ -1,9 +1,9 @@
 //
-// $Id: SceneMarshaller.java 4145 2006-05-24 01:24:24Z ray $
+// $Id$
 //
-// Narya library - tools for developing networked games
+// Vilya library - tools for developing networked games
 // Copyright (C) 2002-2006 Three Rings Design, Inc., All Rights Reserved
-// http://www.threerings.net/code/narya/
+// http://www.threerings.net/code/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it
 // under the terms of the GNU Lesser General Public License as published
diff --git a/src/java/com/threerings/whirled/server/SceneDispatcher.java b/src/java/com/threerings/whirled/server/SceneDispatcher.java
index 2b4902c8..2de73359 100644
--- a/src/java/com/threerings/whirled/server/SceneDispatcher.java
+++ b/src/java/com/threerings/whirled/server/SceneDispatcher.java
@@ -1,9 +1,9 @@
 //
-// $Id: SceneDispatcher.java 4145 2006-05-24 01:24:24Z ray $
+// $Id$
 //
-// Narya library - tools for developing networked games
+// Vilya library - tools for developing networked games
 // Copyright (C) 2002-2006 Three Rings Design, Inc., All Rights Reserved
-// http://www.threerings.net/code/narya/
+// http://www.threerings.net/code/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it
 // under the terms of the GNU Lesser General Public License as published
@@ -46,13 +46,13 @@ public class SceneDispatcher extends InvocationDispatcher
         this.provider = provider;
     }
 
-    // documentation inherited
+    // from InvocationDispatcher
     public InvocationMarshaller createMarshaller ()
     {
         return new SceneMarshaller();
     }
 
-    // documentation inherited
+    @SuppressWarnings("unchecked") // from InvocationDispatcher
     public void dispatchRequest (
         ClientObject source, int methodId, Object[] args)
         throws InvocationException
diff --git a/src/java/com/threerings/whirled/server/SceneSender.java b/src/java/com/threerings/whirled/server/SceneSender.java
index 5132c732..db925059 100644
--- a/src/java/com/threerings/whirled/server/SceneSender.java
+++ b/src/java/com/threerings/whirled/server/SceneSender.java
@@ -1,9 +1,9 @@
 //
-// $Id: SceneSender.java 4145 2006-05-24 01:24:24Z ray $
+// $Id$
 //
-// Narya library - tools for developing networked games
+// Vilya library - tools for developing networked games
 // Copyright (C) 2002-2006 Three Rings Design, Inc., All Rights Reserved
-// http://www.threerings.net/code/narya/
+// http://www.threerings.net/code/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it
 // under the terms of the GNU Lesser General Public License as published
diff --git a/src/java/com/threerings/whirled/spot/data/SpotMarshaller.java b/src/java/com/threerings/whirled/spot/data/SpotMarshaller.java
index 7fbf1a92..e6b549c8 100644
--- a/src/java/com/threerings/whirled/spot/data/SpotMarshaller.java
+++ b/src/java/com/threerings/whirled/spot/data/SpotMarshaller.java
@@ -1,9 +1,9 @@
 //
-// $Id: SpotMarshaller.java 4145 2006-05-24 01:24:24Z ray $
+// $Id$
 //
-// Narya library - tools for developing networked games
+// Vilya library - tools for developing networked games
 // Copyright (C) 2002-2006 Three Rings Design, Inc., All Rights Reserved
-// http://www.threerings.net/code/narya/
+// http://www.threerings.net/code/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it
 // under the terms of the GNU Lesser General Public License as published
diff --git a/src/java/com/threerings/whirled/spot/data/SpotSceneObject.java b/src/java/com/threerings/whirled/spot/data/SpotSceneObject.java
index 76dee0e0..4e7bfddd 100644
--- a/src/java/com/threerings/whirled/spot/data/SpotSceneObject.java
+++ b/src/java/com/threerings/whirled/spot/data/SpotSceneObject.java
@@ -88,7 +88,9 @@ public class SpotSceneObject extends SceneObject
     public void setOccupantLocs (DSet value)
     {
         requestAttributeChange(OCCUPANT_LOCS, value, this.occupantLocs);
-        this.occupantLocs = (value == null) ? null : value.typedClone();
+        @SuppressWarnings("unchecked") DSet clone =
+            (value == null) ? null : value.typedClone();
+        this.occupantLocs = clone;
     }
 
     /**
@@ -134,7 +136,9 @@ public class SpotSceneObject extends SceneObject
     public void setClusters (DSet value)
     {
         requestAttributeChange(CLUSTERS, value, this.clusters);
-        this.clusters = (value == null) ? null : value.typedClone();
+        @SuppressWarnings("unchecked") DSet clone =
+            (value == null) ? null : value.typedClone();
+        this.clusters = clone;
     }
     // AUTO-GENERATED: METHODS END
 }
diff --git a/src/java/com/threerings/whirled/spot/server/SpotDispatcher.java b/src/java/com/threerings/whirled/spot/server/SpotDispatcher.java
index a7e17b11..de00cdbc 100644
--- a/src/java/com/threerings/whirled/spot/server/SpotDispatcher.java
+++ b/src/java/com/threerings/whirled/spot/server/SpotDispatcher.java
@@ -1,9 +1,9 @@
 //
-// $Id: SpotDispatcher.java 4145 2006-05-24 01:24:24Z ray $
+// $Id$
 //
-// Narya library - tools for developing networked games
+// Vilya library - tools for developing networked games
 // Copyright (C) 2002-2006 Three Rings Design, Inc., All Rights Reserved
-// http://www.threerings.net/code/narya/
+// http://www.threerings.net/code/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it
 // under the terms of the GNU Lesser General Public License as published
@@ -47,13 +47,13 @@ public class SpotDispatcher extends InvocationDispatcher
         this.provider = provider;
     }
 
-    // documentation inherited
+    // from InvocationDispatcher
     public InvocationMarshaller createMarshaller ()
     {
         return new SpotMarshaller();
     }
 
-    // documentation inherited
+    @SuppressWarnings("unchecked") // from InvocationDispatcher
     public void dispatchRequest (
         ClientObject source, int methodId, Object[] args)
         throws InvocationException
diff --git a/src/java/com/threerings/whirled/zone/client/ZoneDecoder.java b/src/java/com/threerings/whirled/zone/client/ZoneDecoder.java
index 647fe1e3..9a4c8c45 100644
--- a/src/java/com/threerings/whirled/zone/client/ZoneDecoder.java
+++ b/src/java/com/threerings/whirled/zone/client/ZoneDecoder.java
@@ -1,9 +1,9 @@
 //
-// $Id: ZoneDecoder.java 4145 2006-05-24 01:24:24Z ray $
+// $Id$
 //
-// Narya library - tools for developing networked games
+// Vilya library - tools for developing networked games
 // Copyright (C) 2002-2006 Three Rings Design, Inc., All Rights Reserved
-// http://www.threerings.net/code/narya/
+// http://www.threerings.net/code/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it
 // under the terms of the GNU Lesser General Public License as published
diff --git a/src/java/com/threerings/whirled/zone/data/ZoneMarshaller.java b/src/java/com/threerings/whirled/zone/data/ZoneMarshaller.java
index 9371dbb7..1b40cff9 100644
--- a/src/java/com/threerings/whirled/zone/data/ZoneMarshaller.java
+++ b/src/java/com/threerings/whirled/zone/data/ZoneMarshaller.java
@@ -1,9 +1,9 @@
 //
-// $Id: ZoneMarshaller.java 4145 2006-05-24 01:24:24Z ray $
+// $Id$
 //
-// Narya library - tools for developing networked games
+// Vilya library - tools for developing networked games
 // Copyright (C) 2002-2006 Three Rings Design, Inc., All Rights Reserved
-// http://www.threerings.net/code/narya/
+// http://www.threerings.net/code/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it
 // under the terms of the GNU Lesser General Public License as published
diff --git a/src/java/com/threerings/whirled/zone/server/ZoneDispatcher.java b/src/java/com/threerings/whirled/zone/server/ZoneDispatcher.java
index d5585b8d..ed1cc440 100644
--- a/src/java/com/threerings/whirled/zone/server/ZoneDispatcher.java
+++ b/src/java/com/threerings/whirled/zone/server/ZoneDispatcher.java
@@ -1,9 +1,9 @@
 //
-// $Id: ZoneDispatcher.java 4145 2006-05-24 01:24:24Z ray $
+// $Id$
 //
-// Narya library - tools for developing networked games
+// Vilya library - tools for developing networked games
 // Copyright (C) 2002-2006 Three Rings Design, Inc., All Rights Reserved
-// http://www.threerings.net/code/narya/
+// http://www.threerings.net/code/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it
 // under the terms of the GNU Lesser General Public License as published
@@ -47,13 +47,13 @@ public class ZoneDispatcher extends InvocationDispatcher
         this.provider = provider;
     }
 
-    // documentation inherited
+    // from InvocationDispatcher
     public InvocationMarshaller createMarshaller ()
     {
         return new ZoneMarshaller();
     }
 
-    // documentation inherited
+    @SuppressWarnings("unchecked") // from InvocationDispatcher
     public void dispatchRequest (
         ClientObject source, int methodId, Object[] args)
         throws InvocationException
diff --git a/src/java/com/threerings/whirled/zone/server/ZoneSender.java b/src/java/com/threerings/whirled/zone/server/ZoneSender.java
index 121cd715..ee17cec1 100644
--- a/src/java/com/threerings/whirled/zone/server/ZoneSender.java
+++ b/src/java/com/threerings/whirled/zone/server/ZoneSender.java
@@ -1,9 +1,9 @@
 //
-// $Id: ZoneSender.java 4145 2006-05-24 01:24:24Z ray $
+// $Id$
 //
-// Narya library - tools for developing networked games
+// Vilya library - tools for developing networked games
 // Copyright (C) 2002-2006 Three Rings Design, Inc., All Rights Reserved
-// http://www.threerings.net/code/narya/
+// http://www.threerings.net/code/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it
 // under the terms of the GNU Lesser General Public License as published