Dealt with warnings, made @string resources