Adding extra fields and removing trailing "?>"s.