Fixed a lot of things with the DB
Fixed a lot of things with the db, again