Fixed another henious bug.  And yet there are more.