updated strings.xml and other cleanup