Fixes

-Add back removed strings by accident
-XML Errors
-Remove duplicaed arrays
-Java errors