Fix name and email updating

Also includes minor cleanup