Updating routes and some db fixes