Tweak

Few small tweaks and a lot of string changes by @dertuxmalwieder from #1011