diff --git a/galleryscript.js b/galleryscript.js
index acb3039..a74fa9b 100644
--- a/galleryscript.js
+++ b/galleryscript.js
@@ -977,7 +977,10 @@ function showimage(i) {
     if (i>imagelist.length-1 || i<0) { return; }
     thumblist(i,i);
     var dirStr=$('#imagecontainer').data('ID')<i ? '-' : '+';
-    var revDirStr=$('#imagecontainer').data('ID')<i ? '+' : '-';
+    var revDirStr=dirStr=='-' ? '+' : '-';
+    var animateOut=(slideshowinterval!=0 && Math.abs(slideshowinterval)<2) ? 0 : 100;
+    var animateIn=animateOut/2;
+
     $('#imagecontainer').clearQueue();
     $('#imagecontainer').stop();
     $('#imagecontainer').css('margin-left', '0px');
@@ -985,7 +988,7 @@ function showimage(i) {
     $('#imagecontainer').animate({
         'marginLeft' : dirStr+"=200px",
         'opacity' : "-=1"
-    },100, function() {
+    },animateOut, function() {
         $('#imagecontainer').css('margin-left', revDirStr+'200px');
         showbigimage(i);
         preload(i);
@@ -995,7 +998,7 @@ function showimage(i) {
         $('#imagecontainer').animate({
         'marginLeft' : dirStr+"=200px",
         'opacity' : "+=1"
-        },50);
+        },animateIn);
     });
     
     return;
diff --git a/gallerystyle.css b/gallerystyle.css
index e4a4309..93056d8 100644
--- a/gallerystyle.css
+++ b/gallerystyle.css
@@ -1,5 +1,6 @@
 body {
     margin: 5px;
+    overflow-x: hidden;
 }
 
 .imagebox {