Changed some text and minor settings