Updated strings (intermediate commit)
Updated strings (#2)
Merge pull request #640 from zumbrunnen/string_fixes

String fixes/improvements