Minor changes, recoding datamodel still in progress