added washington, dc
Better wrapping of names, some style fixes.