diff --git a/note.cls b/note.cls
index 3086fa9..a670c90 100644
--- a/note.cls
+++ b/note.cls
@@ -62,15 +62,15 @@
 
 % Section
 \skip_const:Nn \c__note_section_skip
-  { ( \c__note_par_skip * 150 ) / 100 }
+  { ( \c__note_par_skip * 200 ) / 100 }
 
 % Subsection
 \skip_const:Nn \c__note_subsection_skip
-  { ( \c__note_par_skip * 135 ) / 100 }
+  { ( \c__note_par_skip * 160 ) / 100 }
 
 % Subsubsection
 \skip_const:Nn \c__note_subsubsection_skip
-  { ( \c__note_par_skip * 120 ) / 100 }
+  { ( \c__note_par_skip * 130 ) / 100 }
 
 % Total spacing between successive list items
 \skip_const:Nn \c__note_list_total_item_sep_skip
@@ -145,14 +145,9 @@
 
 \ProcessKeysOptions { note/options }
 
-\bool_gset:Nn \g__note_show_head_bool
+\str_if_eq:VnF \g__note_mode_str { note }
   {
-    \str_case:VnF \g__note_mode_str
-      {
-        { letter } { \c_false_bool }
-        { brief } { \c_false_bool }
-      }
-      { \c_true_bool }
+    \bool_gset_false:N \g__note_show_head_bool
   }
 
 
@@ -160,6 +155,7 @@
 
 \RequirePackage { fontspec }
 \RequirePackage { xparse }
+\RequirePackage { etl }
 \RequirePackage [ latin, english, french ] { babel }
 \RequirePackage [ babel ] { csquotes }
 \RequirePackage { enumitem }
@@ -304,9 +300,16 @@
 
 %% Section
 
+\str_if_eq:VnT \g__note_mode_str { brief }
+  {
+    \cs_gset_eq:NN \sectionbreak \clearpage
+  }
+
 \titleformat { \section }
   [ block ]
   {
+    %\str_if_eq:VnT \g__note_mode_str { brief }
+    %  { \centering }
     \sffamily \Large \bfseries
     \color { note/dark-blue }
   }
@@ -314,10 +317,10 @@
   { \skip_use:N \c__note_heading_sep_skip }
   {#1}
 
-\titlespacing \section
-  { 0pt }
-  { \skip_use:N \c__note_section_skip }
-  { \skip_use:N \c__note_section_skip }
+%\titlespacing \section
+%  { 0pt }
+%  { \skip_use:N \c__note_section_skip }
+%  { \skip_use:N \c__note_section_skip }
 
 \tl_gset:Nn \thesection
   { \Roman { section } }
@@ -334,10 +337,10 @@
   { \skip_use:N \c__note_heading_sep_skip }
   {#1}
 
-\titlespacing \subsection
-  { 0pt }
-  { \skip_use:N \c__note_subsection_skip }
-  { \skip_use:N \c__note_subsection_skip }
+%\titlespacing \subsection
+%  { 0pt }
+%  { \skip_use:N \c__note_subsection_skip }
+%  { \skip_use:N \c__note_subsection_skip }
 
 \tl_gset:Nn \thesubsection
   { \thesection . \Alph { subsection } }
@@ -354,10 +357,10 @@
   { \skip_use:N \c__note_heading_sep_skip }
   {#1}
 
-\titlespacing \subsubsection
-  { 0pt }
-  { \skip_use:N \c__note_subsubsection_skip }
-  { \skip_use:N \c__note_subsubsection_skip }
+%\titlespacing \subsubsection
+%  { 0pt }
+%  { \skip_use:N \c__note_subsubsection_skip }
+%  { \skip_use:N \c__note_subsubsection_skip }
 
 \tl_gset:Nn \thesubsubsection
   { \thesubsection . \arabic { subsubsection } }
@@ -874,7 +877,7 @@
 %%% End of page
 
 \NewDocumentEnvironment { endofpage } {}
-  { \vfill }
+  { \vfill } % FIXME
   {}
 
 
@@ -893,9 +896,11 @@
       {
         \kern -3pt
         \textcolor { note/dark-blue }
-          { \rule { .25 \textwidth } { .75pt } }
+          { \hrule height .75pt width .25  \textwidth }
         \vspace { .5em }
-      }
+    }
+    \cs_gset:Npn \@makefnmark
+      { \hbox { \textsuperscript { \sffamily \@thefnmark } } }
   }
 
 
@@ -956,7 +961,7 @@
                 \tl_if_empty:nF {##3}
                   {
                     , \\
-                    \textit { ##3 }
+                    { \itshape ##3 }
                   }
               }
           \end { \tl_use:N \l__note_sigs_flush_tl }
@@ -967,11 +972,13 @@
 \DeclareDocumentCommand \opening {m}
   {
     #1
-    \vspace* { 1em }
+    \vspace { 1em }
   }
 
 \DeclareDocumentCommand \closing {m}
   {
-    \vspace* { 1em }
+    \vspace { 1em }
     #1
   }
+
+\flushbottom