bug fixes, forename to firstname