Add some names (from new)
Fix longstanding bug in data