corrected strings to last version. Do merging with dev