Add fields, some cleanup