minor comment changes + string.xml name changes