Added fullname
Made replacements nicer