Fixed some warnings and updated strings