minor bugfix with firstname
cleanup