Normalise names, use full name on first instance. Other small cleanups.