yon
committed
on 29 Mar 02
some cleanup (not finished)