Minor tweaks
merged Johns delete replace
brought changes to databases and data sets from common/etc
fix of JT merge