yon
committed
on 21 May 02
fixing a few bugs