diff --git a/mods/better_smooth_water.js b/mods/better_smooth_water.js
new file mode 100644
index 00000000..3fdd1163
--- /dev/null
+++ b/mods/better_smooth_water.js
@@ -0,0 +1,6 @@
+elements.water.behavior = [
+    "XX|XX|XX",
+    "M2%5|XX|M2 AND BO",
+    "XX|M1|M2",
+];
+elements.water.flippableX = true;
\ No newline at end of file
diff --git a/mods/fast_lightmap.js b/mods/fast_lightmap.js
index 5bb48d84..434b4768 100644
--- a/mods/fast_lightmap.js
+++ b/mods/fast_lightmap.js
@@ -181,7 +181,7 @@ function glowItsOwnColor(pixel) {
 }
 
 function glowItsOwnColorIfPowered(pixel) {
-	if (pixel.charge <= 0) {return;}
+    if (!pixel.charge || pixel.charge <= 0) {return;}
     if (!pixel.color) return;
     var x = Math.floor(pixel.x / lightmapScale);
     var y = Math.floor(pixel.y / lightmapScale);
diff --git a/mods/lightmap.js b/mods/lightmap.js
index 70641230..a1f95031 100644
--- a/mods/lightmap.js
+++ b/mods/lightmap.js
@@ -181,7 +181,7 @@ function glowItsOwnColor(pixel) {
 }
 
 function glowItsOwnColorIfPowered(pixel) {
-	if (pixel.charge <= 0) {return;}
+    if (!pixel.charge || pixel.charge <= 0) {return;}
     if (!pixel.color) return;
     var x = Math.floor(pixel.x / lightmapScale);
     var y = Math.floor(pixel.y / lightmapScale);