jowells
committed
on 22 Sep 01
Various cleanups