Updates, and fix to make actually databaseless