Externalized strings and cleaned up some XML warnings.