null improvements to the database scaffold