diff --git a/assets/contributors/avatars/100072714?v=4.jpg b/assets/contributors/avatars/100072714?v=4.jpg
new file mode 100644
index 00000000..0612d87a
Binary files /dev/null and b/assets/contributors/avatars/100072714?v=4.jpg differ
diff --git a/assets/contributors/git.json b/assets/contributors/git.json
index 23f06620..0109a485 100644
--- a/assets/contributors/git.json
+++ b/assets/contributors/git.json
@@ -14,21 +14,26 @@
         "avatar_url": "assets/contributors/avatars/108967802?v=4.jpg",
         "profile_url": "https://github.com/bdOtopsy63"
     },
-    {
-        "username": "weblate",
-        "avatar_url": "assets/contributors/avatars/1607653?v=4.jpg",
-        "profile_url": "https://github.com/weblate"
-    },
     {
         "username": "CloneWith",
         "avatar_url": "assets/contributors/avatars/110881926?v=4.jpg",
         "profile_url": "https://github.com/CloneWith"
     },
+    {
+        "username": "weblate",
+        "avatar_url": "assets/contributors/avatars/1607653?v=4.jpg",
+        "profile_url": "https://github.com/weblate"
+    },
     {
         "username": "ngocanhtve",
         "avatar_url": "assets/contributors/avatars/125894401?v=4.jpg",
         "profile_url": "https://github.com/ngocanhtve"
     },
+    {
+        "username": "Schipunov",
+        "avatar_url": "assets/contributors/avatars/23407397?v=4.jpg",
+        "profile_url": "https://github.com/Schipunov"
+    },
     {
         "username": "zxrpn",
         "avatar_url": "assets/contributors/avatars/91787031?v=4.jpg",
@@ -89,11 +94,6 @@
         "avatar_url": "assets/contributors/avatars/45366162?v=4.jpg",
         "profile_url": "https://github.com/NathanBnm"
     },
-    {
-        "username": "Schipunov",
-        "avatar_url": "assets/contributors/avatars/23407397?v=4.jpg",
-        "profile_url": "https://github.com/Schipunov"
-    },
     {
         "username": "matsukky",
         "avatar_url": "assets/contributors/avatars/46320254?v=4.jpg",
@@ -119,6 +119,11 @@
         "avatar_url": "assets/contributors/avatars/38784748?v=4.jpg",
         "profile_url": "https://github.com/jona512"
     },
+    {
+        "username": "HeXedek",
+        "avatar_url": "assets/contributors/avatars/100072714?v=4.jpg",
+        "profile_url": "https://github.com/HeXedek"
+    },
     {
         "username": "thejenja",
         "avatar_url": "assets/contributors/avatars/65224669?v=4.jpg",
diff --git a/fastlane/metadata/android/en-US/changelogs/231.txt b/fastlane/metadata/android/en-US/changelogs/231.txt
index 3f6fd893..796d82c0 100644
--- a/fastlane/metadata/android/en-US/changelogs/231.txt
+++ b/fastlane/metadata/android/en-US/changelogs/231.txt
@@ -6,8 +6,8 @@ Changes since v0.4.3:
   * Added analog and digital clock widgets
   * Added option to customize size, alignment, color, font weight, formats
 * Added localizations
-  * Chinese, French, Spanish mostly complete
-  * Partial support for Bengali, German, Italian, Norwegian, Polish, Portuguese, Russian, Turkish, and Vietnamese
+  * Chinese, French, Spanish, Turkish and Portuguese mostly complete
+  * Partial support for Bengali, German, Italian, Norwegian, Polish, Russian,and Vietnamese
   * Add your favorite language here: https://hosted.weblate.org/projects/chrono
 
 ✨ Enhancements
diff --git a/fastlane/metadata/android/en-US/changelogs/232.txt b/fastlane/metadata/android/en-US/changelogs/232.txt
index 3f6fd893..796d82c0 100644
--- a/fastlane/metadata/android/en-US/changelogs/232.txt
+++ b/fastlane/metadata/android/en-US/changelogs/232.txt
@@ -6,8 +6,8 @@ Changes since v0.4.3:
   * Added analog and digital clock widgets
   * Added option to customize size, alignment, color, font weight, formats
 * Added localizations
-  * Chinese, French, Spanish mostly complete
-  * Partial support for Bengali, German, Italian, Norwegian, Polish, Portuguese, Russian, Turkish, and Vietnamese
+  * Chinese, French, Spanish, Turkish and Portuguese mostly complete
+  * Partial support for Bengali, German, Italian, Norwegian, Polish, Russian,and Vietnamese
   * Add your favorite language here: https://hosted.weblate.org/projects/chrono
 
 ✨ Enhancements
diff --git a/fastlane/metadata/android/en-US/changelogs/233.txt b/fastlane/metadata/android/en-US/changelogs/233.txt
index a16add7b..796d82c0 100644
--- a/fastlane/metadata/android/en-US/changelogs/233.txt
+++ b/fastlane/metadata/android/en-US/changelogs/233.txt
@@ -6,8 +6,8 @@ Changes since v0.4.3:
   * Added analog and digital clock widgets
   * Added option to customize size, alignment, color, font weight, formats
 * Added localizations
-  * Chinese, French, Spanish, Turkish, Portugese mostly complete
-  * Partial support for Bengali, German, Italian, Norwegian, Polish, Russian, and Vietnamese
+  * Chinese, French, Spanish, Turkish and Portuguese mostly complete
+  * Partial support for Bengali, German, Italian, Norwegian, Polish, Russian,and Vietnamese
   * Add your favorite language here: https://hosted.weblate.org/projects/chrono
 
 ✨ Enhancements
diff --git a/fastlane/metadata/android/en-US/changelogs/241.txt b/fastlane/metadata/android/en-US/changelogs/241.txt
new file mode 100644
index 00000000..902ae5cf
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/241.txt
@@ -0,0 +1,9 @@
+✨ Enhancements
+
+* Updated translations
+
+🐛 Fixes
+
+* Removed extra space at the end of long date formats
+* Fix timer fullscreen notification not dismissing
+* Fix fastest and slowest laps of stopwatch not saving
diff --git a/fastlane/metadata/android/en-US/changelogs/242.txt b/fastlane/metadata/android/en-US/changelogs/242.txt
new file mode 100644
index 00000000..902ae5cf
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/242.txt
@@ -0,0 +1,9 @@
+✨ Enhancements
+
+* Updated translations
+
+🐛 Fixes
+
+* Removed extra space at the end of long date formats
+* Fix timer fullscreen notification not dismissing
+* Fix fastest and slowest laps of stopwatch not saving
diff --git a/fastlane/metadata/android/en-US/changelogs/243.txt b/fastlane/metadata/android/en-US/changelogs/243.txt
new file mode 100644
index 00000000..902ae5cf
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/243.txt
@@ -0,0 +1,9 @@
+✨ Enhancements
+
+* Updated translations
+
+🐛 Fixes
+
+* Removed extra space at the end of long date formats
+* Fix timer fullscreen notification not dismissing
+* Fix fastest and slowest laps of stopwatch not saving
diff --git a/lib/settings/data/general_settings_schema.dart b/lib/settings/data/general_settings_schema.dart
index 1bbd4174..1843e658 100644
--- a/lib/settings/data/general_settings_schema.dart
+++ b/lib/settings/data/general_settings_schema.dart
@@ -59,11 +59,11 @@ final dateFormatOptions = [
 
 final longDateFormatOptions = [
   _getDateSettingOption("EEE, MMM d"),
-  _getDateSettingOption("EEE, MMMM d "),
+  _getDateSettingOption("EEE, MMMM d"),
   _getDateSettingOption("EEE, d MMM"),
   _getDateSettingOption("EEE, d MMMM"),
   _getDateSettingOption("EEEE, MMM d"),
-  _getDateSettingOption("EEEE, MMMM d "),
+  _getDateSettingOption("EEEE, MMMM d"),
   _getDateSettingOption("EEEE, d MMM"),
   _getDateSettingOption("EEEE, d MMMM"),
 ];
diff --git a/lib/stopwatch/types/stopwatch.dart b/lib/stopwatch/types/stopwatch.dart
index 19a88ef4..2f1701e2 100644
--- a/lib/stopwatch/types/stopwatch.dart
+++ b/lib/stopwatch/types/stopwatch.dart
@@ -94,7 +94,9 @@ class ClockStopwatch extends JsonSerializable {
     }
   }
 
+
   void updateFastestAndSlowestLap() {
+    if(laps.isEmpty) return;
     _fastestLap = _laps.reduce((value, element) =>
         value.lapTime.inMilliseconds < element.lapTime.inMilliseconds
             ? value
@@ -144,5 +146,6 @@ class ClockStopwatch extends JsonSerializable {
         orElse: () => TimerState.stopped);
     _id = json['id'] ?? UniqueKey().hashCode;
     _laps = ((json['laps'] ?? []) as List).map((e) => Lap.fromJson(e)).toList();
+    updateFastestAndSlowestLap();
   }
 }
diff --git a/lib/timer/screens/timer_notification_screen.dart b/lib/timer/screens/timer_notification_screen.dart
index 21a8e95e..4a291c79 100644
--- a/lib/timer/screens/timer_notification_screen.dart
+++ b/lib/timer/screens/timer_notification_screen.dart
@@ -36,13 +36,13 @@ class _TimerNotificationScreenState extends State<TimerNotificationScreen> {
       );
 
   void _addTime() {
-    AlarmNotificationManager.snoozeAlarm(
-        widget.scheduleIds[0], ScheduledNotificationType.timer);
+    AlarmNotificationManager.dismissNotification(widget.scheduleIds[0],
+        AlarmDismissType.snooze, ScheduledNotificationType.timer);
   }
 
   void _stop() {
-    AlarmNotificationManager.dismissAlarm(
-        widget.scheduleIds[0], ScheduledNotificationType.timer);
+    AlarmNotificationManager.dismissNotification(widget.scheduleIds[0],
+        AlarmDismissType.dismiss, ScheduledNotificationType.timer);
   }
 
   @override
diff --git a/pubspec.yaml b/pubspec.yaml
index 12af8dde..068c8a30 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -2,7 +2,7 @@ name: clock_app
 description: An alarm, clock, timer and stowatch app.
 
 publish_to: "none" # Remove this line if you wish to publish to pub.dev
-version: 0.5.0+23
+version: 0.5.1+24
 
 environment:
   sdk: ">=2.18.6 <4.0.0"