finalizing database revamp