some minor changes here and there (mainly strings)