more improvements to the database