diff --git a/.clang-format b/.clang-format
index 03d7bdc9..64df85bb 100644
--- a/.clang-format
+++ b/.clang-format
@@ -1,16 +1,22 @@
 Language: Cpp
 BasedOnStyle: Google
 AlignOperands: false
+AllowAllArgumentsOnNextLine: false
 AllowAllConstructorInitializersOnNextLine: false
 AllowAllParametersOfDeclarationOnNextLine: false
-AllowShortFunctionsOnASingleLine: InlineOnly
+AllowShortIfStatementsOnASingleLine: Never
 AlwaysBreakAfterReturnType: TopLevel
 # fails
 BinPackParameters: false
+BinPackArguments: false
 BraceWrapping:   
   AfterClass: true
   AfterStruct: true
   AfterFunction: true
+  BeforeElse: true
 BreakBeforeBraces: Custom
-# fails
+# fails if all initializers fit on one line
 BreakConstructorInitializers: AfterColon
+# fails
+ConstructorInitializerAllOnOneLineOrOnePerLine: false
+IncludeBlocks: Preserve