diff --git a/README.md b/README.md
index d63bbed..cabc96d 100644
--- a/README.md
+++ b/README.md
@@ -1,14 +1,14 @@
 # Divergence Meter
 Android divergence meter widget like that in Steins;Gate.
 
-#### Features
+### Features
 - Displaying divergence number in nixie tubes;
 - Changing the divergence every 2 hours;
 - Balanced random system, that lowers the chance of going to another attractor field;
 - Ability to set your own divergence number;
 - Notifications, when changing attractor field.
 
-#### Images
+### Images
 Normal view:
 
 ![widget preview](app/src/main/res/drawable-nodpi/appwidget_preview.jpg)
@@ -20,9 +20,6 @@ With minus:
 ## Download
 https://github.com/retanar/Divergence_Meter/releases
 
-#### Known issues
+### Known issues
 - For unknown reasons, you may encounter an error "Problem loading widget". 
 Fix: delete and add the widget again.
-- There is -1.000000 divergence which is displayed as -.000000
-- Although the program uses a modified random generator it's still random, so it's possible to switch the attractor field a few times in a row. 
-I'm working on a fix for this for the 0.4.0 version.
diff --git a/app/build.gradle b/app/build.gradle
index 1014d62..da0577d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@ android {
         minSdkVersion 16
         targetSdkVersion 30
         versionCode 1
-        versionName "0.4.0 alpha 3"
+        versionName "0.4.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
diff --git a/app/src/main/java/com/vlprojects/divergence/DivergenceWidget.kt b/app/src/main/java/com/vlprojects/divergence/DivergenceWidget.kt
index f727dbf..f4cecb6 100644
--- a/app/src/main/java/com/vlprojects/divergence/DivergenceWidget.kt
+++ b/app/src/main/java/com/vlprojects/divergence/DivergenceWidget.kt
@@ -6,7 +6,7 @@ import android.appwidget.AppWidgetManager
 import android.content.Context
 import android.content.Context.NOTIFICATION_SERVICE
 import android.os.Build
-import android.util.Log
+//import android.util.Log
 import android.widget.RemoteViews
 import androidx.core.app.NotificationCompat
 import com.vlprojects.divergence.DivergenceMeter.getDivergenceValuesOrGenerate
@@ -18,12 +18,12 @@ class DivergenceWidget : android.appwidget.AppWidgetProvider() {
     override fun onEnabled(context: Context) {
         super.onEnabled(context)
 
-        val prefs = context.getSharedPreferences(SHARED_FILENAME, 0)
-        val (currentDiv, nextDiv) = prefs.getDivergenceValuesOrGenerate()
-        Log.d(
-            "DivergenceWidget", "onEnabled() call. Current divergence = $currentDiv; " +
-                    "Next divergence = $nextDiv"
-        )
+//        val prefs = context.getSharedPreferences(SHARED_FILENAME, 0)
+//        val (currentDiv, nextDiv) = prefs.getDivergenceValuesOrGenerate()
+//        Log.d(
+//            "DivergenceWidget",
+//            "onEnabled() call. Current divergence = $currentDiv; Next divergence = $nextDiv"
+//        )
 
         createNotificationChannel(context)
     }
@@ -80,7 +80,7 @@ class DivergenceWidget : android.appwidget.AppWidgetProvider() {
     /** Notifications **/
 
     private fun sendNotification(context: Context, text: String) {
-        Log.d("DivergenceWidget", "sendNotification() call with text = \"$text\"")
+//        Log.d("DivergenceWidget", "sendNotification() call with text = \"$text\"")
         val notifyManager = getNotificationManager(context)
         val builder = NotificationCompat.Builder(context, CHANGE_WORLDLINE_NOTIFICATION_CHANNEL)
             .setSmallIcon(R.drawable.ic_notification)
diff --git a/app/src/main/java/com/vlprojects/divergence/MainActivity.kt b/app/src/main/java/com/vlprojects/divergence/MainActivity.kt
index be22836..8a4ccc8 100644
--- a/app/src/main/java/com/vlprojects/divergence/MainActivity.kt
+++ b/app/src/main/java/com/vlprojects/divergence/MainActivity.kt
@@ -15,16 +15,17 @@ import com.vlprojects.divergence.databinding.ActivityMainBinding
 class MainActivity : AppCompatActivity() {
 
     private lateinit var binding: ActivityMainBinding
-    private val prefs by lazy { getSharedPreferences(SHARED_FILENAME, 0) }
+    private lateinit var prefs: SharedPreferences
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding = ActivityMainBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
+        prefs = getSharedPreferences(SHARED_FILENAME, 0)
         setDivergenceText()
         binding.changeDivergenceButton.setOnClickListener { changeDivergence(prefs) }
-        prefs.registerOnSharedPreferenceChangeListener(onPreferenceChangeListener)
+        prefs.registerOnSharedPreferenceChangeListener(onDivergenceChangeListener)
     }
 
     private fun setDivergenceText() {
@@ -64,7 +65,7 @@ class MainActivity : AppCompatActivity() {
     }
 
     // Using field so it won't be garbage collected
-    private val onPreferenceChangeListener = SharedPreferences.OnSharedPreferenceChangeListener { _, tag ->
+    private val onDivergenceChangeListener = SharedPreferences.OnSharedPreferenceChangeListener { _, tag ->
         if (tag == SHARED_CURRENT_DIVERGENCE)
             setDivergenceText()
     }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 890ca65..a363622 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -26,7 +26,7 @@
             android:layout_width="match_parent"
             android:layout_height="1dp"
             android:background="?android:attr/listDivider"
-            android:layout_margin="6dp"/>
+            android:layout_margin="8dp"/>
         <LinearLayout
             android:orientation="horizontal"
             android:layout_width="match_parent"
@@ -80,7 +80,7 @@
                 android:inputType="numberSigned|numberDecimal"
                 android:hint="@string/hint_enter_new_divergence_here"
                 android:layout_marginBottom="16dp"
-                android:importantForAutofill="no"/>
+                android:importantForAutofill="no" android:maxLength="9"/>
             <Button
                 android:id="@+id/changeDivergenceButton"
                 android:text="@string/change"