diff --git a/4chan_x.user.js b/4chan_x.user.js
index e25da3052..4ea5f2889 100644
--- a/4chan_x.user.js
+++ b/4chan_x.user.js
@@ -49,6 +49,8 @@
  *
  * CONTRIBUTORS
  *
+ * e000 - cooldown sanity check
+ * ahokadesuka - scroll back when unexpanding images
  * Shou- - pentadactyl fixes
  * ferongr - new favicons
  * xat- - new favicons
@@ -1455,12 +1457,12 @@
       if (g.REPLY) return $('.postarea form').action += '?cooldown';
     },
     start: function() {
-      var submit, _i, _len, _ref;
+      var submit, _i, _len, _ref, _ref2;
       cooldown.duration = Math.ceil(($.get(g.BOARD + '/cooldown', 0) - Date.now()) / 1000);
-      if (!(cooldown.duration > 0)) return;
-      _ref = $$('#com_submit');
-      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-        submit = _ref[_i];
+      if (!((60 >= (_ref = cooldown.duration) && _ref > 0))) return;
+      _ref2 = $$('#com_submit');
+      for (_i = 0, _len = _ref2.length; _i < _len; _i++) {
+        submit = _ref2[_i];
         submit.value = cooldown.duration;
         submit.disabled = true;
       }
@@ -3276,6 +3278,7 @@
       #ihover {\
         max-height: 100%;\
         max-width: 75%;\
+        padding-bottom: 18px;\
       }\
 \
       #navlinks {\
diff --git a/Cakefile b/Cakefile
index b95e2b2c5..905ebb561 100644
--- a/Cakefile
+++ b/Cakefile
@@ -56,6 +56,8 @@ HEADER  = """
  *
  * CONTRIBUTORS
  *
+ * e000 - cooldown sanity check
+ * ahokadesuka - scroll back when unexpanding images
  * Shou- - pentadactyl fixes
  * ferongr - new favicons
  * xat- - new favicons
diff --git a/changelog b/changelog
index 4af786053..0cccbf08a 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,10 @@
 master
+- ahokadesuka
+  Scroll back up when unexpanding images.
+- e000
+  Prevent absurd cooldown durations.
+- Mayhem
+  Better image expanding reload, should fool CloudFlare's cache.
 
 2.24.3
 - Mayhem