Fixed field names for forms (verbose names); modified things as necessary