diff --git a/Setting-up-the-config-file.md b/Setting-up-the-config-file.md
index 245e9ec..9f5de1e 100644
--- a/Setting-up-the-config-file.md
+++ b/Setting-up-the-config-file.md
@@ -164,7 +164,7 @@ The settings-branch is quite extensive, and besides the `world`-node, it is basi
 * `spectate-on-death: [true|false]` - If false, players will not get warped to the spectator area, but instead be "kicked" from the arena (essentially a forced /ma leave).
 * `auto-respawn: [true|false]` - If false, players will be greeted with the typical death screen upon dying in the arena, and will have to click the respawn button to respawn. With this setting at false, players will actually die in the arena, meaning plugins like Heroes and mcMMO will properly trigger their resetting of internal data upon respawn.
 * `share-items-in-arena: [true|false]` - If false, players will not be able to drop items in the arena.
-* `min-players: <amount>` - Gives a lower limit on how many players are required to start the arena. The default of `0` is the same as `1`, which means 1 or more players may start the arena.
+* `min-players: <amount>` - Gives a lower limit on how many players are required to start the arena. The default of `0` is the same as `1`, which means 1 or more players may start the arena. Note that this feature is incompatible with `auto-start-timer` and `start-delay-timer`!
 * `max-players: <amount>` - Gives an upper limit on how many players may join the arena. The default of `0` means no limit.
 * `max-join-distance: <distance>` - The maximum distance (in blocks) from which players can join or spectate the arena. If 0 (default), there is no limit, and players can join from any world. Note that the distance is calculated from every corner of the arena region, and that players not in the arena world won't be able to join or spectate.
 * `first-wave-delay: <time>` - The time (in seconds) before the first wave of monsters upon arena start.
@@ -177,7 +177,8 @@ The settings-branch is quite extensive, and besides the `world`-node, it is basi
 * `lock-food-level: [true|false]` - If true, the food bar will be locked for all players in the arena, meaning they will not end up starving, and they will be able to sprint around as they please.
 * `player-time-in-arena: <time of day>` - When set to anything but world, this setting will freeze the apparent world time for players in the arena to whatever value you set. This is useful for making time-of-day themed arenas (e.g. constant night time for a cemetery, broad daylight for a pirate ship). Valid values are: dawn, sunrise, morning, midday, noon, day, afternoon, evening, sunset, dusk, night, midnight.
 * `auto-ignite-tnt: [true|false]` - If true, TNT will be automatically ignited when placed. This is useful for preventing Oddjob-like classes from forting.
-* `auto-start-timer: <time>` - The time (in seconds) before the arena will be force started after the first player has joined the lobby (the default of 0 means deactivated or infinite time). Non-ready players will be removed from the lobby. This setting is useful to prevent ill-minded players from delaying or preventing other players from starting the arena.
+* `auto-start-timer: <time>` - The time (in seconds) before the arena will be force started after the first player has joined the lobby (the default of 0 means deactivated or infinite time). Non-ready players will be removed from the lobby. This setting is useful to prevent ill-minded players from delaying or preventing other players from starting the arena. Note that this feature is incompatible with `min-players`!
+* `start-delay-timer: <time>` - The time (in seconds) before the arena can be started after the first player has joined the lobby. This setting is useful if you want to give your players a fixed window of time to join the arena after the first player has joined, so they can't just start it off right away. Note that this feature is incompatible with `min-players`!
 * `display-waves-as-level: [true|false]` - When set to true, the players' level counter (above the experience bar) will be used to display the current wave number. If the wave announcements in the announcements-file are silenced, this can be used to make a much less "spammy" MobArena experience. NOTE: Do not use this if `keep-exp` is set to true!
 * `display-timer-as-level: [true|false]` - When set to true, the players' level counter (above the experience bar) will be used to display the auto-start timer in the lobby. NOTE: Do not use this if `keep-exp` is set to true!
 * `auto-ready: [true|false]` - When set to true, players are automatically flagged as ready when they pick a class. Useful for arenas with many players where hitting an iron block becomes difficult.