UPDATED: change log and string.xml comments