Some names optimizations and added some formulas for switching firstname with lastname based on the namelists
Is not complete yet but should already give better results.