Fixed some more String issues, made output more useful.