michaels
committed
on 12 Apr 05
use listbuilder plus some misc cleanup