Some fixups. Db data added.