Update strings.xml and fix some strings