diff --git a/.rustfmt.toml b/.rustfmt.toml
index bfc63d9..947975b 100644
--- a/.rustfmt.toml
+++ b/.rustfmt.toml
@@ -1,67 +1,72 @@
-max_width = 90 # changed
+# Most of the changed settings had defaults made for backcompat with earlier editions. Brief
+# descriptions are provided for nontrivial changes, otherwise a simple "changed" is used.
+
+binop_separator = "Front"
+blank_lines_lower_bound = 0
+blank_lines_upper_bound = 1
+brace_style = "SameLineWhere"
+color = "Auto"
+combine_control_expr = false # better all around in our opinions
+comment_width = 80 # changed
+condense_wildcard_suffixes = true # changed
+control_brace_style = "AlwaysSameLine"
+disable_all_formatting = false
+edition = "2018" # changed
+empty_item_single_line = true
+enum_discrim_align_threshold = 0
+error_on_line_overflow = true # be more strict
+error_on_unformatted = true # be more strict
+fn_args_layout = "Tall"
+fn_single_line = false # unchanged, this does not work well with the long expressions of this crate
+force_explicit_abi = true
+force_multiline_blocks = true # help certain closures
+format_code_in_doc_comments = true # changed
+format_macro_bodies = true # changed
+format_macro_matchers = true # changed
+format_strings = true # changed
 hard_tabs = false
-tab_spaces = 4
-newline_style = "Auto"
-use_small_heuristics = "Default"
+hide_parse_errors = false
+ignore = []
+imports_indent = "Block"
+imports_layout = "HorizontalVertical" # handles lots of imports better
 indent_style = "Block"
-wrap_comments = false
-format_code_in_doc_comments = false
-comment_width = 80
-normalize_comments = true # changed
-normalize_doc_attributes = false
+inline_attribute_width = 0 # unchanged, for ease of editing
 # license_template_path = "LICENSE_TEMPLATE" # changed
-format_strings = false
-format_macro_matchers = false
-format_macro_bodies = true
-empty_item_single_line = true
-struct_lit_single_line = true
-fn_single_line = false
-where_single_line = false
-imports_indent = "Block"
-imports_layout = "Vertical" # changed
+match_arm_blocks = true
+match_block_trailing_comma = false
+max_width = 100 # changed
+merge_derives = true
 merge_imports = true # changed
+newline_style = "Unix" # changed, prevents problems when a file is created on Windows
+normalize_comments = true # no /* */ comments should be in master
+normalize_doc_attributes = true # changed
+overflow_delimited_expr = false
+remove_nested_parens = true
+reorder_impl_items = true # changed
 reorder_imports = true
 reorder_modules = true
-reorder_impl_items = false
-type_punctuation_density = "Wide"
-space_before_colon = false
+report_fixme = "Never"
+report_todo = "Never"
+# required_version = "CARGO_PKG_VERSION"
+skip_children = false
 space_after_colon = true
+space_before_colon = false
 spaces_around_ranges = false
-binop_separator = "Front"
-remove_nested_parens = true
-combine_control_expr = false # changed
-overflow_delimited_expr = false
 struct_field_align_threshold = 0
-enum_discrim_align_threshold = 0
-match_arm_blocks = true
-force_multiline_blocks = true # changed
-fn_args_layout = "Tall"
-brace_style = "SameLineWhere"
-control_brace_style = "AlwaysSameLine"
-trailing_semicolon = false # changed
+struct_lit_single_line = true
+tab_spaces = 4
 trailing_comma = "Vertical"
-match_block_trailing_comma = false
-blank_lines_upper_bound = 1
-blank_lines_lower_bound = 0
-edition = "2018" # changed
-version = "One"
-merge_derives = true
-use_try_shorthand = true # changed
-use_field_init_shorthand = true # changed
-force_explicit_abi = true
-condense_wildcard_suffixes = false
-color = "Auto"
+trailing_semicolon = false # should be clear enough
+type_punctuation_density = "Wide"
 unstable_features = true # changed
-disable_all_formatting = false
-skip_children = false
-hide_parse_errors = false
-error_on_line_overflow = false
-error_on_unformatted = false
-report_todo = "Always"
-report_fixme = "Always"
-ignore = []
+use_field_init_shorthand = true # changed
+use_small_heuristics = "Default"
+use_try_shorthand = true # changed
+version = "Two" # changed
+where_single_line = false # unchanged, for ease of editing
+wrap_comments = true # fits comments to the line
 
 # Below are `rustfmt` internal settings
 #
 # emit_mode = "Files"
-# make_backup = false
+# make_backup = false
\ No newline at end of file