danw
committed
on 23 May 01
finished cleanup of data-model, it now loads without errors