Some fixes & externalization of remaining Strings

Hi Jared,

first thanks for crediting me.
I did some more improvements and fixes. The commit comments should be self-explanatory.

Best regards,
Sven