Fill out more fields
More cleanup