yon
committed
on 13 Feb 02
cleaned up and fixed some bugs