Added space support in forename, commas in forename and surname
Clean up