corrected comments and field names