diff --git a/Yampa.cabal b/Yampa.cabal
--- a/Yampa.cabal
+++ b/Yampa.cabal
@@ -1,5 +1,5 @@
 Name:               Yampa
-Version:            0.9.1.1
+Version:            0.9.1.2
 License:            BSD3
 License-File:       LICENSE.txt
 Copyright:          Henrik Nilsson, Antony Courtney and Yale University, (c) 2003
diff --git a/src/AFRP.hs b/src/AFRP.hs
--- a/src/AFRP.hs
+++ b/src/AFRP.hs
@@ -1,16 +1,15 @@
-{- $Id: AFRP.hs,v 1.37 2004/03/22 19:46:40 antony Exp $
-******************************************************************************
-*                                  A F R P                                   *
-*                                                                            *
-*       Module:         AFRP                                                 *
-*       Purpose:        The AFRP core.					     *
-*	Authors:	Henrik Nilsson and Antony Courtney		     *
-*                                                                            *
-*             Copyright (c) Yale University, 2003                            *
-*                                                                            *
-******************************************************************************
--}
-
+-----------------------------------------------------------------------------
+-- |
+-- Module      :  AFRP
+-- Copyright   :  (c) Yale University, 2003
+-- License     :  BSD-style (see the file LICENSE)
+-- 
+-- Maintainer  :  antony@apocalypse.org
+-- Stability   :  provisional
+-- Portability :  non-portable (uses GHC extensions)
+--
+-- The AFRP core.
+--
 -- ToDo:
 -- * Check embedSynch for space leaks. It might be a good idea to force
 --   "dropped frames".
diff --git a/src/AFRPAffineSpace.hs b/src/AFRPAffineSpace.hs
--- a/src/AFRPAffineSpace.hs
+++ b/src/AFRPAffineSpace.hs
@@ -1,16 +1,15 @@
-{- $Id: AFRPAffineSpace.hs,v 1.2 2003/11/10 21:28:58 antony Exp $
-******************************************************************************
-*                                  A F R P                                   *
-*                                                                            *
-*       Module:		AFRPAffineSpace					     *
-*       Purpose:	Affine space type relation.			     *
-*	Authors:	Henrik Nilsson and Antony Courtney		     *
-*                                                                            *
-*             Copyright (c) Yale University, 2003                            *
-*                                                                            *
-******************************************************************************
--}
-
+-----------------------------------------------------------------------------
+-- |
+-- Module      :  AFRPAffineSpace
+-- Copyright   :  (c) Yale University, 2003
+-- License     :  BSD-style (see the file LICENSE)
+-- 
+-- Maintainer  :  antony@apocalypse.org
+-- Stability   :  provisional
+-- Portability :  non-portable (uses GHC extensions)
+--
+-- Affine space type relation.
+--
 module AFRPAffineSpace where
 
 import AFRPVectorSpace
diff --git a/src/AFRPDiagnostics.hs b/src/AFRPDiagnostics.hs
--- a/src/AFRPDiagnostics.hs
+++ b/src/AFRPDiagnostics.hs
@@ -1,16 +1,15 @@
-{- $Id: AFRPDiagnostics.hs,v 1.3 2003/11/10 21:28:58 antony Exp $
-******************************************************************************
-*                                  A F R P                                   *
-*                                                                            *
-*       Module:         AFRPDiagnostics                                      *
-*       Purpose:        Standardized error-reporting for AFRP                *
-*	Authors:	Henrik Nilsson and Antony Courtney		     *
-*                                                                            *
-*             Copyright (c) Yale University, 2003                            *
-*                                                                            *
-******************************************************************************
--}
-
+-----------------------------------------------------------------------------
+-- |
+-- Module      :  AFRPDiagnostics
+-- Copyright   :  (c) Yale University, 2003
+-- License     :  BSD-style (see the file LICENSE)
+-- 
+-- Maintainer  :  antony@apocalypse.org
+-- Stability   :  provisional
+-- Portability :  non-portable (uses GHC extensions)
+--
+-- Standardized error-reporting for AFRP 
+--
 module AFRPDiagnostics where
 
 usrErr mn fn msg = error (mn ++ "." ++ fn ++ ": " ++ msg)
diff --git a/src/AFRPEvent.hs b/src/AFRPEvent.hs
--- a/src/AFRPEvent.hs
+++ b/src/AFRPEvent.hs
@@ -1,16 +1,16 @@
-{- $Id: AFRPEvent.hs,v 1.17 2003/12/19 15:31:50 henrik Exp $
-******************************************************************************
-*                                  A F R P                                   *
-*                                                                            *
-*       Module:         AFRPEvent                                            *
-*       Purpose:        Definition of AFRP Event type.			     *
-*	Authors:	Antony Courtney and Henrik Nilsson		     *
-*                                                                            *
-*             Copyright (c) Yale University, 2003                            *
-*                                                                            *
-******************************************************************************
--}
-
+-----------------------------------------------------------------------------
+-- |
+-- Module      :  AFRPEvent
+-- Copyright   :  (c) Yale University, 2003
+-- License     :  BSD-style (see the file LICENSE)
+-- 
+-- Maintainer  :  antony@apocalypse.org
+-- Stability   :  provisional
+-- Portability :  non-portable (uses GHC extensions)
+--
+-- Definition of AFRP Event type.
+--
+{-
 -- Note on naming conventions used in this module.
 --
 -- Names here might have to be rethought. It's really a bit messy.
@@ -70,7 +70,7 @@
 --           and call what's now called "fromEvent" something else, like
 --           "unsafeFromEvent"??? Better, dump it! After all, using current
 --	     names, "fromEvent = event undefined"!
-
+-}
 module AFRPEvent where
 
 import AFRPDiagnostics
diff --git a/src/AFRPForceable.hs b/src/AFRPForceable.hs
--- a/src/AFRPForceable.hs
+++ b/src/AFRPForceable.hs
@@ -1,16 +1,15 @@
-{- $Id: AFRPForceable.hs,v 1.2 2003/11/10 21:28:58 antony Exp $
-******************************************************************************
-*                                  A F R P                                   *
-*                                                                            *
-*       Module:         AFRPForceable                                        *
-*       Purpose:        Hyperstrict evaluation.				     *
-*	Author:		Zhanyong Wan					     *
-*                                                                            *
-*             Copyright (c) Yale University, 2003                            *
-*                                                                            *
-******************************************************************************
--}
-
+-----------------------------------------------------------------------------
+-- |
+-- Module      :  AFRPForceable
+-- Copyright   :  (c) Zhanyong Wan, Yale University, 2003
+-- License     :  BSD-style (see the file LICENSE)
+-- 
+-- Maintainer  :  antony@apocalypse.org
+-- Stability   :  provisional
+-- Portability :  non-portable (uses GHC extensions)
+--
+-- Hyperstrict evaluation.
+--
 module AFRPForceable where
 
 
diff --git a/src/AFRPGeometry.hs b/src/AFRPGeometry.hs
--- a/src/AFRPGeometry.hs
+++ b/src/AFRPGeometry.hs
@@ -1,16 +1,15 @@
-{- $Id: AFRPGeometry.hs,v 1.3 2003/11/10 21:28:58 antony Exp $
-******************************************************************************
-*                                  A F R P                                   *
-*                                                                            *
-*       Module:		AFRPGeometry					     *
-*       Purpose:	Basic geometrical abstractions.			     *
-*	Authors:	Henrik Nilsson and Antony Courtney		     *
-*                                                                            *
-*             Copyright (c) Yale University, 2003                            *
-*                                                                            *
-******************************************************************************
--}
-
+-----------------------------------------------------------------------------
+-- |
+-- Module      :  AFRPGeometry
+-- Copyright   :  (c) Yale University, 2003
+-- License     :  BSD-style (see the file LICENSE)
+-- 
+-- Maintainer  :  antony@apocalypse.org
+-- Stability   :  provisional
+-- Portability :  non-portable (uses GHC extensions)
+--
+-- Basic geometrical abstractions.
+--
 module AFRPGeometry (
     module AFRPVectorSpace,
     module AFRPAffineSpace,
diff --git a/src/AFRPInternals.hs b/src/AFRPInternals.hs
--- a/src/AFRPInternals.hs
+++ b/src/AFRPInternals.hs
@@ -1,17 +1,16 @@
-{- $Id: AFRPInternals.hs,v 1.2 2003/11/10 21:28:58 antony Exp $
-******************************************************************************
-*                                  A F R P                                   *
-*                                                                            *
-*       Module:         AFRPInternals                                        *
-*       Purpose:        An interface giving access to some of the internal   *
-*			details of the AFRP implementation.		     *
-*	Authors:	Antony Courtney and Henrik Nilsson		     *
-*                                                                            *
-*             Copyright (c) Yale University, 2003                            *
-*                                                                            *
-******************************************************************************
--}
-
+-----------------------------------------------------------------------------
+-- |
+-- Module      :  AFRPInternals
+-- Copyright   :  (c) Yale University, 2003
+-- License     :  BSD-style (see the file LICENSE)
+-- 
+-- Maintainer  :  antony@apocalypse.org
+-- Stability   :  provisional
+-- Portability :  non-portable (uses GHC extensions)
+--
+-- An interface giving access to some of the internal
+-- details of the AFRP implementation.
+--
 -- This interface is indended to be used when the need arises to break
 -- abstraction barriers, e.g. for interfacing AFRP to the real world, for
 -- debugging purposes, or the like. Be aware that the internal details
diff --git a/src/AFRPMergeableRecord.hs b/src/AFRPMergeableRecord.hs
--- a/src/AFRPMergeableRecord.hs
+++ b/src/AFRPMergeableRecord.hs
@@ -1,16 +1,15 @@
-{- $Id: AFRPMergeableRecord.hs,v 1.4 2003/11/10 21:28:58 antony Exp $
-******************************************************************************
-*                                  A F R P                                   *
-*                                                                            *
-*       Module:         AFRPMergeableRecord                                  *
-*       Purpose:        Framework for record merging.			     *
-*	Authors:	Antony Courtney and Henrik Nilsson		     *
-*                                                                            *
-*             Copyright (c) Yale University, 2003                            *
-*                                                                            *
-******************************************************************************
--}
-
+-----------------------------------------------------------------------------
+-- |
+-- Module      :  AFRPMergeableRecord
+-- Copyright   :  (c) Yale University, 2003
+-- License     :  BSD-style (see the file LICENSE)
+-- 
+-- Maintainer  :  antony@apocalypse.org
+-- Stability   :  provisional
+-- Portability :  non-portable (uses GHC extensions)
+--
+-- Framework for record merging.
+--
 -- Idea:
 -- MergeableRecord is intended to be a super class for classes providing
 -- update operations on records. The ADT induced by such a set of operations
diff --git a/src/AFRPMiscellany.hs b/src/AFRPMiscellany.hs
--- a/src/AFRPMiscellany.hs
+++ b/src/AFRPMiscellany.hs
@@ -1,18 +1,17 @@
-{- $Id: AFRPMiscellany.hs,v 1.4 2003/11/10 21:28:58 antony Exp $
-******************************************************************************
-*                                  A F R P                                   *
-*                                                                            *
-*       Module:         AFRPMiscellany					     *
-*       Purpose:        Collection of entities that really should be part    *
-*			of the Haskell 98 prelude or simply have no better   *
-*			home.						     *
-*	Authors:	Henrik Nilsson and Antony Courtney		     *
-*                                                                            *
-*             Copyright (c) Yale University, 2003                            *
-*                                                                            *
-******************************************************************************
--}
-
+-----------------------------------------------------------------------------
+-- |
+-- Module      :  AFRPMiscellany
+-- Copyright   :  (c) Yale University, 2003
+-- License     :  BSD-style (see the file LICENSE)
+-- 
+-- Maintainer  :  antony@apocalypse.org
+-- Stability   :  provisional
+-- Portability :  non-portable (uses GHC extensions)
+--
+-- Collection of entities that really should be part
+-- the Haskell 98 prelude or simply have no better
+-- home.
+--
 module AFRPMiscellany (
 -- Reverse function composition
     ( # ),	-- :: (a -> b) -> (b -> c) -> (a -> c),	infixl 9
diff --git a/src/AFRPPoint2.hs b/src/AFRPPoint2.hs
--- a/src/AFRPPoint2.hs
+++ b/src/AFRPPoint2.hs
@@ -1,16 +1,15 @@
-{- $Id: AFRPPoint2.hs,v 1.3 2003/11/10 21:28:58 antony Exp $
-******************************************************************************
-*                                  A F R P                                   *
-*                                                                            *
-*       Module:		AFRPPoint2					     *
-*       Purpose:	2D point abstraction (R^2).			     *
-*	Authors:	Henrik Nilsson and Antony Courtney		     *
-*                                                                            *
-*             Copyright (c) Yale University, 2003                            *
-*                                                                            *
-******************************************************************************
--}
-
+-----------------------------------------------------------------------------
+-- |
+-- Module      :  AFRPPoint2
+-- Copyright   :  (c) Yale University, 2003
+-- License     :  BSD-style (see the file LICENSE)
+-- 
+-- Maintainer  :  antony@apocalypse.org
+-- Stability   :  provisional
+-- Portability :  non-portable (uses GHC extensions)
+--
+-- 2D point abstraction (R^2).
+--
 module AFRPPoint2 (
     module AFRPVectorSpace,
     module AFRPAffineSpace,
diff --git a/src/AFRPPoint3.hs b/src/AFRPPoint3.hs
--- a/src/AFRPPoint3.hs
+++ b/src/AFRPPoint3.hs
@@ -1,16 +1,15 @@
-{- $Id: AFRPPoint3.hs,v 1.3 2003/11/10 21:28:58 antony Exp $
-******************************************************************************
-*                                  A F R P                                   *
-*                                                                            *
-*       Module:		AFRPPoint3					     *
-*       Purpose:	3D point abstraction (R^3).			     *
-*	Authors:	Henrik Nilsson and Antony Courtney		     *
-*                                                                            *
-*             Copyright (c) Yale University, 2003                            *
-*                                                                            *
-******************************************************************************
--}
-
+-----------------------------------------------------------------------------
+-- |
+-- Module      :  AFRPPoint3
+-- Copyright   :  (c) Yale University, 2003
+-- License     :  BSD-style (see the file LICENSE)
+-- 
+-- Maintainer  :  antony@apocalypse.org
+-- Stability   :  provisional
+-- Portability :  non-portable (uses GHC extensions)
+--
+-- 3D point abstraction (R^3).
+--
 module AFRPPoint3 (
     module AFRPVectorSpace,
     module AFRPAffineSpace,
diff --git a/src/AFRPTask.hs b/src/AFRPTask.hs
--- a/src/AFRPTask.hs
+++ b/src/AFRPTask.hs
@@ -1,16 +1,15 @@
-{- $Id: AFRPTask.hs,v 1.6 2003/11/10 21:28:58 antony Exp $
-******************************************************************************
-*                                  A F R P                                   *
-*                                                                            *
-*       Module:         AFRPTask                                             *
-*       Purpose:        Task abstraction on top of signal transformers.      *
-*	Authors:	Antony Courtney and Henrik Nilsson		     *
-*                                                                            *
-*             Copyright (c) Yale University, 2003                            *
-*                                                                            *
-******************************************************************************
--}
-
+-----------------------------------------------------------------------------
+-- |
+-- Module      :  AFRPTask
+-- Copyright   :  (c) Yale University, 2003
+-- License     :  BSD-style (see the file LICENSE)
+-- 
+-- Maintainer  :  antony@apocalypse.org
+-- Stability   :  provisional
+-- Portability :  non-portable (uses GHC extensions)
+--
+-- Task abstraction on top of signal transformers.
+--
 module AFRPTask (
     Task,
     mkTask,	-- :: SF a (b, Event c) -> Task a b c
diff --git a/src/AFRPUtilities.hs b/src/AFRPUtilities.hs
--- a/src/AFRPUtilities.hs
+++ b/src/AFRPUtilities.hs
@@ -1,16 +1,15 @@
-{- $Id: AFRPUtilities.hs,v 1.8 2003/12/19 15:31:50 henrik Exp $
-******************************************************************************
-*                                  A F R P                                   *
-*                                                                            *
-*       Module:         AFRPUtilities                                        *
-*       Purpose:        Derived utility definitions.			     *
-*	Authors:	Antony Courtney and Henrik Nilsson		     *
-*                                                                            *
-*             Copyright (c) Yale University, 2003                            *
-*                                                                            *
-******************************************************************************
--}
-
+-----------------------------------------------------------------------------
+-- |
+-- Module      :  AFRPUtilities
+-- Copyright   :  (c) Yale University, 2003
+-- License     :  BSD-style (see the file LICENSE)
+-- 
+-- Maintainer  :  antony@apocalypse.org
+-- Stability   :  provisional
+-- Portability :  non-portable (uses GHC extensions)
+--
+-- Derived utility definitions.
+--
 -- ToDo:
 -- * Possibly add
 --       impulse :: VectorSpace a k => a -> Event a
diff --git a/src/AFRPVector2.hs b/src/AFRPVector2.hs
--- a/src/AFRPVector2.hs
+++ b/src/AFRPVector2.hs
@@ -1,16 +1,15 @@
-{- $Id: AFRPVector2.hs,v 1.5 2004/03/22 19:46:40 antony Exp $
-******************************************************************************
-*                                  A F R P                                   *
-*                                                                            *
-*       Module:		AFRPVector2					     *
-*       Purpose:	2D vector abstraction (R^2).			     *
-*	Authors:	Henrik Nilsson and Antony Courtney		     *
-*                                                                            *
-*             Copyright (c) Yale University, 2003                            *
-*                                                                            *
-******************************************************************************
--}
-
+-----------------------------------------------------------------------------
+-- |
+-- Module      :  AFRPVector2
+-- Copyright   :  (c) Yale University, 2003
+-- License     :  BSD-style (see the file LICENSE)
+-- 
+-- Maintainer  :  antony@apocalypse.org
+-- Stability   :  provisional
+-- Portability :  non-portable (uses GHC extensions)
+--
+-- 2D vector abstraction (R^2).
+--
 module AFRPVector2 (
     module AFRPVectorSpace,
     Vector2,		-- Abstract, instance of VectorSpace
diff --git a/src/AFRPVector3.hs b/src/AFRPVector3.hs
--- a/src/AFRPVector3.hs
+++ b/src/AFRPVector3.hs
@@ -1,16 +1,15 @@
-{- $Id: AFRPVector3.hs,v 1.3 2003/11/10 21:28:58 antony Exp $
-******************************************************************************
-*                                  A F R P                                   *
-*                                                                            *
-*       Module:		AFRPVector3					     *
-*       Purpose:	3D vector abstraction (R^3).			     *
-*	Authors:	Henrik Nilsson and Antony Courtney		     *
-*                                                                            *
-*             Copyright (c) Yale University, 2003                            *
-*                                                                            *
-******************************************************************************
--}
-
+-----------------------------------------------------------------------------
+-- |
+-- Module      :  AFRPVector3
+-- Copyright   :  (c) Yale University, 2003
+-- License     :  BSD-style (see the file LICENSE)
+-- 
+-- Maintainer  :  antony@apocalypse.org
+-- Stability   :  provisional
+-- Portability :  non-portable (uses GHC extensions)
+--
+-- 3D vector abstraction (R^3).
+--
 module AFRPVector3 (
     module AFRPVectorSpace,
     Vector3,		-- Abstract, instance of VectorSpace
diff --git a/src/AFRPVectorSpace.hs b/src/AFRPVectorSpace.hs
--- a/src/AFRPVectorSpace.hs
+++ b/src/AFRPVectorSpace.hs
@@ -1,16 +1,15 @@
-{- $Id: AFRPVectorSpace.hs,v 1.2 2003/11/10 21:28:58 antony Exp $
-******************************************************************************
-*                                  A F R P                                   *
-*                                                                            *
-*       Module:		AFRPVectorSpace					     *
-*       Purpose:	Vector space type relation and basic instances.	     *
-*	Authors:	Henrik Nilsson and Antony Courtney		     *
-*                                                                            *
-*             Copyright (c) Yale University, 2003                            *
-*                                                                            *
-******************************************************************************
--}
-
+-----------------------------------------------------------------------------
+-- |
+-- Module      :  AFRPVectorSpace
+-- Copyright   :  (c) Yale University, 2003
+-- License     :  BSD-style (see the file LICENSE)
+-- 
+-- Maintainer  :  antony@apocalypse.org
+-- Stability   :  provisional
+-- Portability :  non-portable (uses GHC extensions)
+--
+-- Vector space type relation and basic instances.	
+--
 module AFRPVectorSpace where
 
 ------------------------------------------------------------------------------
