Changed some strings and step 2 of DBmanager