Fix typos etc from major rewrite
Put names in creating line