diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index f1b4245..4cacdff 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -19,3 +19,8 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
+
+-keepattributes *Annotation*
+-keepattributes SourceFile,LineNumberTable
+-keep class com.crashlytics.** { *; }
+-dontwarn com.crashlytics.**
\ No newline at end of file
diff --git a/app/src/main/java/com/denizd/substitutionplan/CardAdapter.kt b/app/src/main/java/com/denizd/substitutionplan/CardAdapter.kt
index 946a290..3625fcb 100644
--- a/app/src/main/java/com/denizd/substitutionplan/CardAdapter.kt
+++ b/app/src/main/java/com/denizd/substitutionplan/CardAdapter.kt
@@ -31,7 +31,7 @@ class CardAdapter(private var mSubst: List<Subst>) : RecyclerView.Adapter<CardAd
         var mCourse: TextView = itemView.findViewById(R.id.course)
         var mRoom: TextView = itemView.findViewById(R.id.room)
         var mAdditional: TextView = itemView.findViewById(R.id.additional)
-        var mCard = itemView.findViewById<MaterialCardView>(R.id.planCard)
+        var mCard: MaterialCardView = itemView.findViewById(R.id.planCard)
         init { view.setOnClickListener(this) }
         override fun onClick(v: View?) {
             if (mDate.text.toString().length > 7 && mDate.text.toString().substring(3, 7) == "http") {
diff --git a/app/src/main/java/com/denizd/substitutionplan/Main.kt b/app/src/main/java/com/denizd/substitutionplan/Main.kt
index 480389d..4ffce55 100644
--- a/app/src/main/java/com/denizd/substitutionplan/Main.kt
+++ b/app/src/main/java/com/denizd/substitutionplan/Main.kt
@@ -6,7 +6,6 @@ import android.content.SharedPreferences
 import android.os.Build
 import android.os.Bundle
 import android.preference.PreferenceManager
-import android.util.Log
 import android.view.*
 import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
@@ -38,11 +37,7 @@ class Main : AppCompatActivity(R.layout.app_bar_main) {
         prefs = PreferenceManager.getDefaultSharedPreferences(context) as SharedPreferences
         val edit = prefs.edit()
         val firstTime = Intent(context, FirstTime::class.java)
-
-        val deviceName = DeviceName.with(context).request { deviceInfo, _ ->
-            deviceInfo.marketName
-        }
-        Crashlytics.setUserIdentifier("$deviceName, ${prefs.getString("username", "") ?: ""}")
+        Crashlytics.setUserIdentifier(prefs.getString("username", "") ?: "")
 
         if (prefs.getBoolean("firstTime", true)) {
 //        if (true) {
diff --git a/app/src/main/java/com/denizd/substitutionplan/SettingsFragment.kt b/app/src/main/java/com/denizd/substitutionplan/SettingsFragment.kt
index 01d3bbb..f946395 100644
--- a/app/src/main/java/com/denizd/substitutionplan/SettingsFragment.kt
+++ b/app/src/main/java/com/denizd/substitutionplan/SettingsFragment.kt
@@ -30,8 +30,8 @@ import kotlin.collections.ArrayList
 
 class SettingsFragment : Fragment(R.layout.content_settings), View.OnClickListener, CompoundButton.OnCheckedChangeListener, ColourAdapter.OnClickListener {
 
-    private lateinit var name: String
-    private lateinit var model: String
+    private var name = ""
+    private var model = ""
 
     private lateinit var mContext: Context
     private lateinit var prefs: SharedPreferences