Added names for factions
Cleanup
reorganized test initializing in map window