diff --git a/src/org/apache/fop/area/LineArea.java b/src/org/apache/fop/area/LineArea.java
index 0ba001f5e..fc7771da0 100644
--- a/src/org/apache/fop/area/LineArea.java
+++ b/src/org/apache/fop/area/LineArea.java
@@ -8,8 +8,6 @@
 package org.apache.fop.area;
 
 import org.apache.fop.area.inline.InlineArea;
-import org.apache.fop.layoutmgr.LayoutInfo;
-import org.apache.fop.fo.properties.VerticalAlign;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/org/apache/fop/area/inline/InlineArea.java b/src/org/apache/fop/area/inline/InlineArea.java
index 2278806d5..98a8fc992 100644
--- a/src/org/apache/fop/area/inline/InlineArea.java
+++ b/src/org/apache/fop/area/inline/InlineArea.java
@@ -13,8 +13,6 @@ import org.apache.fop.area.Trait;
 import org.apache.fop.render.Renderer;
 import org.apache.fop.traits.BorderProps;
 
-import org.apache.fop.layoutmgr.LayoutInfo;
-
 import java.util.List;
 import java.util.ArrayList;
 
diff --git a/src/org/apache/fop/fo/flow/ExternalGraphic.java b/src/org/apache/fop/fo/flow/ExternalGraphic.java
index bef021138..6f18214d1 100644
--- a/src/org/apache/fop/fo/flow/ExternalGraphic.java
+++ b/src/org/apache/fop/fo/flow/ExternalGraphic.java
@@ -16,7 +16,6 @@ import org.apache.fop.image.*;
 import org.apache.fop.area.inline.InlineArea;
 import org.apache.fop.layoutmgr.LayoutManager;
 import org.apache.fop.layoutmgr.LeafNodeLayoutManager;
-import org.apache.fop.layoutmgr.LayoutInfo;
 import org.apache.fop.area.inline.Image;
 import org.apache.fop.area.inline.Viewport;
 import org.apache.fop.datatypes.*;
diff --git a/src/org/apache/fop/fo/flow/InstreamForeignObject.java b/src/org/apache/fop/fo/flow/InstreamForeignObject.java
index 47a50453d..e6da7233c 100644
--- a/src/org/apache/fop/fo/flow/InstreamForeignObject.java
+++ b/src/org/apache/fop/fo/flow/InstreamForeignObject.java
@@ -25,7 +25,6 @@ import org.apache.fop.layout.RelativePositionProps;
 import org.apache.fop.apps.FOPException;
 import org.apache.fop.layoutmgr.LayoutManager;
 import org.apache.fop.layoutmgr.LeafNodeLayoutManager;
-import org.apache.fop.layoutmgr.LayoutInfo;
 
 import org.w3c.dom.Document;
 
diff --git a/src/org/apache/fop/layoutmgr/LineBPLayoutManager.java b/src/org/apache/fop/layoutmgr/LineBPLayoutManager.java
index eebec2529..337980d2c 100644
--- a/src/org/apache/fop/layoutmgr/LineBPLayoutManager.java
+++ b/src/org/apache/fop/layoutmgr/LineBPLayoutManager.java
@@ -456,10 +456,6 @@ public class LineBPLayoutManager extends InlineStackingBPLayoutManager {
         BreakPoss curLineBP = new BreakPoss( new LineBreakPosition(this,
                                              m_vecInlineBreaks.size() - 1, dAdjust, lineLead + middlefollow, lineLead));
 
-        /* FIX ME!!
-         * Need to calculate line height based on all inline BP info
-         * for this line not just the current inlineBP!
-         */
         curLineBP.setFlag(BreakPoss.ISLAST, isFinished());
         curLineBP.setStackingSize(new MinOptMax(lineLead + middlefollow));
         return curLineBP;
diff --git a/status.xml b/status.xml
index df9984fe8..611d0ae06 100644
--- a/status.xml
+++ b/status.xml
@@ -68,11 +68,6 @@ inactive??
       When doing the static areas the markers wil need to be available for
       retrieving. The marker can then be layed out as normal.
     </action>
-    <action context="code" dev="open">
-      Calculate line height.
-      The line height needs to be calculated while finding breaks. This needs
-      to include all the alignment and height details of the inline areas.
-    </action>
     <action context="code" dev="open">
       implement the caching mechanism to store pages
       when a page contains a forward reference that has not been
@@ -126,6 +121,11 @@ inactive??
 
   <changes>
    <release version="?" date="2002">
+    <action dev="KLL" type="update" context="code">
+      Calculate line height.
+      The line height is calculated while finding breaks.
+      Improved alignment to use the breaks and context.
+    </action>
     <action dev="KLL" type="update" context="code">
       Updated batik with change to TextPainter interface and UserAgent.
       Improved PDFTextPainter to handle more types of text.
@@ -283,6 +283,10 @@ inactive??
     <action dev="KL" type="add" context="code">
       New layout system using layout managers
     </action>
+    <action dev="KL" type="add" context="code">
+      Implemented handlers for whitespace handling that collapse whitespace
+      better in various places
+    </action>
     <action dev="KLL" type="update" context="code">
      Changed area tree xml format to match the area tree hierarchy
     </action>