Changing language should be functioning properly. some clean up.