diff --git a/data/images/terrain.png b/data/images/terrain.png
index f14bbed..7991d0a 100755
Binary files a/data/images/terrain.png and b/data/images/terrain.png differ
diff --git a/src/client/Options.cpp b/src/client/Options.cpp
index c0fcfbc..7f965e8 100755
--- a/src/client/Options.cpp
+++ b/src/client/Options.cpp
@@ -168,9 +168,7 @@ void Options::set(OptionId key, const std::string& value) {
 
 	if (option) {
 		option->set(value);
-
 		notifyOptionUpdate(key, value);
-		save();
 	}
 }
 
@@ -179,9 +177,7 @@ void Options::set(OptionId key, float value) {
 
 	if (option) {
 		option->set(value);
-
 		notifyOptionUpdate(key, value);
-		save();
 	}
 }
 
@@ -190,9 +186,7 @@ void Options::set(OptionId key, int value) {
 
 	if (option) {
 		option->set(value);
-
 		notifyOptionUpdate(key, value);
-		save();
 	}
 }
 
@@ -201,9 +195,7 @@ void Options::toggle(OptionId key) {
 
 	if (option) {
 		option->toggle();
-
 		notifyOptionUpdate(key, option->get());
-		save();
 	}
 }
 
diff --git a/src/client/gui/screens/OptionsScreen.cpp b/src/client/gui/screens/OptionsScreen.cpp
index 8c3066b..61d1389 100755
--- a/src/client/gui/screens/OptionsScreen.cpp
+++ b/src/client/gui/screens/OptionsScreen.cpp
@@ -217,9 +217,6 @@ void OptionsScreen::generateOptionScreens() {
 
 	// // Graphics Pane
 	optionPanes[3]->addOptionItem(OPTIONS_FANCY_GRAPHICS, minecraft)
-		// .addOptionItem(&Options::Option::VIEW_BOBBING, minecraft)
-		// .addOptionItem(&Options::Option::AMBIENT_OCCLUSION, minecraft)
-		// .addOptionItem(&Options::Option::ANAGLYPH, minecraft)
 		.addOptionItem(OPTIONS_LIMIT_FRAMERATE, minecraft)
 		.addOptionItem(OPTIONS_VSYNC, minecraft)
 		.addOptionItem(OPTIONS_RENDER_DEBUG, minecraft)
diff --git a/src/util/Mth.cpp b/src/util/Mth.cpp
index d19eef6..ecf3841 100755
--- a/src/util/Mth.cpp
+++ b/src/util/Mth.cpp
@@ -9,10 +9,10 @@ static Random _rand;
 
 namespace Mth
 {
-	const float PI = 3.1415926535897932384626433832795028841971f; // exactly!
-	const float TWO_PI = 2.0f * PI; // exactly!
-	const float DEGRAD = PI / 180.0f;
-	const float RADDEG = 180.0f / PI;
+	constexpr float PI = 3.1415926535897932384626433832795028841971f; // exactly!
+	constexpr float TWO_PI = 2.0f * PI; // exactly!
+	constexpr float DEGRAD = PI / 180.0f;
+	constexpr float RADDEG = 180.0f / PI;
 
 	static float _sin[65536];
 	static const float _sinScale = 65536.0f / (2.0f * PI);