Organize strings and minor fixes