Added db changes, updated namecleaner