diff --git a/app/src/main/java/net/pokeranalytics/android/calculus/Calculator.kt b/app/src/main/java/net/pokeranalytics/android/calculus/Calculator.kt
index ff68b8b4..638c7cb5 100644
--- a/app/src/main/java/net/pokeranalytics/android/calculus/Calculator.kt
+++ b/app/src/main/java/net/pokeranalytics/android/calculus/Calculator.kt
@@ -58,10 +58,10 @@ class Calculator {
 
 	companion object {
 
-		fun computePreAggregation(sets: List<SessionSet>, options: Options): List<ComputedResults> {
-			Timber.d("sets = ${sets.size}")
-			return listOf()
-		}
+//		fun computePreAggregation(sets: List<SessionSet>, options: Options): List<ComputedResults> {
+//			Timber.d("sets = ${sets.size}")
+//			return listOf()
+//		}
 
 		/**
 		 * Computes all stats for list of Session sessionGroup
@@ -168,6 +168,9 @@ class Calculator {
 
 					}
 				}
+				else -> {
+					// nothing
+				}
 			}
 
 			val sessionSets = computableGroup.sets
@@ -190,8 +193,8 @@ class Calculator {
 					var tSum = 0.0
 					var tTotalHands = 0.0
 					var tBBSum = 0.0
-					var tHourlyRate = 0.0
-					var tHourlyRateBB = 0.0
+					var tHourlyRate: Double = 0.0
+					var tHourlyRateBB: Double = 0.0
 
 					sessionSets.forEach { sessionSet ->
 						tIndex++
diff --git a/app/src/main/java/net/pokeranalytics/android/calculus/bankroll/BankrollCalculator.kt b/app/src/main/java/net/pokeranalytics/android/calculus/bankroll/BankrollCalculator.kt
index 2f333f23..3a126a68 100644
--- a/app/src/main/java/net/pokeranalytics/android/calculus/bankroll/BankrollCalculator.kt
+++ b/app/src/main/java/net/pokeranalytics/android/calculus/bankroll/BankrollCalculator.kt
@@ -18,14 +18,14 @@ class BankrollCalculator {
 					if (setup.bankroll != null) {
 						sessionQuery.equalTo("bankroll.id", setup.bankroll.id)
 					}
-			val sessions = sessionQuery.findAll()
+//			val sessions = sessionQuery.findAll()
 			val transactionQuery = realm.where(Transaction::class.java)
 			if (setup.bankroll != null) {
 				transactionQuery.equalTo("bankroll.id", setup.bankroll.id).findAll()
 			}
 			val transactions = transactionQuery.findAll()
 
-			val sessionsNet = sessions.sum("result.net")
+//			val sessionsNet = sessions.sum("result.net")
 			val transactionsNet = transactions.sum("value")
 
 			transactions.forEach {
diff --git a/app/src/main/java/net/pokeranalytics/android/model/utils/SessionSetManager.kt b/app/src/main/java/net/pokeranalytics/android/model/utils/SessionSetManager.kt
index 6f59a315..66b4b000 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/utils/SessionSetManager.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/utils/SessionSetManager.kt
@@ -125,9 +125,9 @@ class SessionSetManager {
 			session.sessionSet = set
 
 			// Add all orphan endedSessions
-			sessions.forEach { session ->
-				session.sessionSet = set
-				set.breakDuration = max(set.breakDuration, session.breakDuration)
+			sessions.forEach { s ->
+				s.sessionSet = set
+				set.breakDuration = max(set.breakDuration, s.breakDuration)
 			}
 			set.computeStats()
 
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/activity/HomeActivity.kt b/app/src/main/java/net/pokeranalytics/android/ui/activity/HomeActivity.kt
index 56084034..934317e7 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/activity/HomeActivity.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/activity/HomeActivity.kt
@@ -152,7 +152,7 @@ class HomeActivity : PokerAnalyticsActivity() {
 				}
 
 			}
-			.setNegativeButton(R.string.cancel) {dialog, which ->
+			.setNegativeButton(R.string.cancel) { _, which ->
 				Timber.d("Click on cancel")
 			}
 
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/BankrollDataFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/BankrollDataFragment.kt
index 446039ed..6b108640 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/BankrollDataFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/BankrollDataFragment.kt
@@ -111,7 +111,7 @@ class BankrollDataFragment : EditableDataFragment(), StaticRowRepresentableDataS
 
 	override fun onRowSelected(position: Int, row: RowRepresentable, fromAction: Boolean) {
 		when (row) {
-			BankrollRow.CURRENCY -> CurrenciesActivity.newInstanceForResult(this@BankrollDataFragment, BankrollDataFragment.REQUEST_CODE_CURRENCY)
+			BankrollRow.CURRENCY -> CurrenciesActivity.newInstanceForResult(this@BankrollDataFragment, REQUEST_CODE_CURRENCY)
 			BankrollRow.REFRESH_RATE -> refreshRate()
 			else -> super.onRowSelected(position, row, fromAction)
 		}
@@ -197,7 +197,7 @@ class BankrollDataFragment : EditableDataFragment(), StaticRowRepresentableDataS
 
 			override fun onResponse(call: Call<Map<String, CurrencyConverterValue>>, response: Response<Map<String, CurrencyConverterValue>>) {
 				response.body()?.let {
-					it[currenciesConverterValue]?.value?.let {rate ->
+					it[currenciesConverterValue]?.value?.let { rate ->
 						onRowValueChanged(rate.toString(), BankrollRow.RATE)
 					}
 				}
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetDoubleEditTextFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetDoubleEditTextFragment.kt
index 257c5166..38014ea2 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetDoubleEditTextFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetDoubleEditTextFragment.kt
@@ -88,7 +88,7 @@ class BottomSheetDoubleEditTextFragment : BottomSheetFragment() {
 		}
 
 
-		editText2.setOnEditorActionListener { v, actionId, _ ->
+		editText2.setOnEditorActionListener { _, actionId, _ ->
 			if (actionId == EditorInfo.IME_ACTION_DONE) {
 				this.delegate.onRowValueChanged(values, row)
 				dismiss()
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetEditTextFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetEditTextFragment.kt
index 4e8933d0..66986615 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetEditTextFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetEditTextFragment.kt
@@ -53,7 +53,7 @@ class BottomSheetEditTextFragment : BottomSheetFragment() {
 		editText1.addTextChangedListener { value = it?.toString() ?: "" }
 		editText1.setText((data[0].defaultValue ?: "").toString())
 
-		editText1.setOnEditorActionListener { v, actionId, _ ->
+		editText1.setOnEditorActionListener { _, actionId, _ ->
 			if (actionId == EditorInfo.IME_ACTION_DONE) {
 				delegate.onRowValueChanged(getValue(), row)
 				dismiss()
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetSumFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetSumFragment.kt
index 58f1ff3e..81684a46 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetSumFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetSumFragment.kt
@@ -117,7 +117,7 @@ class BottomSheetSumFragment : BottomSheetFragment() {
 				}
 			}
 
-			editText2.setOnEditorActionListener { v, actionId, _ ->
+			editText2.setOnEditorActionListener { _, actionId, _ ->
 				if (actionId == EditorInfo.IME_ACTION_DONE) {
 					this.delegate.onRowValueChanged(value, row)
 					dismiss()