diff --git a/README b/README
index 8c33729..e38f7b9 100644
--- a/README
+++ b/README
@@ -18,6 +18,10 @@ Martijn van Brummelen
 RELEASE NOTES
 =============
 
+v0.24
+- use include values for version 0.17
+- display throughput value more friendly(Thanks Kelderek)
+
 v0.23
 - make serial visible again on 32Bit machines
 
diff --git a/configure.ac b/configure.ac
index fdde18a..5bf950d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,8 +2,8 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.64])
-AC_INIT(nwipe, 0.23, git@brumit.nl)
-AM_INIT_AUTOMAKE(nwipe, 0.23)
+AC_INIT(nwipe, 0.24, git@brumit.nl)
+AM_INIT_AUTOMAKE(nwipe, 0.24)
 AC_OUTPUT(Makefile src/Makefile man/Makefile)
 AC_CONFIG_SRCDIR([src/nwipe.c])
 AC_CONFIG_HEADERS([config.h])
diff --git a/man/nwipe.1 b/man/nwipe.1
index 0bd4537..7649932 100644
--- a/man/nwipe.1
+++ b/man/nwipe.1
@@ -1,4 +1,4 @@
-.TH NWIPE "1" "December 2017" "nwipe version 0.23" "User Commands"
+.TH NWIPE "1" "December 2017" "nwipe version 0.24" "User Commands"
 .SH NAME
 nwipe \- securely erase disks
 .SH SYNOPSIS
diff --git a/src/gui.c b/src/gui.c
index 7f32e7c..5ba2872 100644
--- a/src/gui.c
+++ b/src/gui.c
@@ -1868,13 +1868,13 @@ void *nwipe_gui_status( void *ptr )
 
 				if( c[i]->sync_status   ) { wprintw( main_window, "[syncing] "   ); }
 
-				     if( c[i]->throughput >= INT64_C( 1000000000000000 ) )
+				     if( c[i]->throughput >= INT64_C( 1000000000000    ) )
 					    { wprintw( main_window, "[%llu TB/s] ", c[i]->throughput / INT64_C( 1000000000000 ) ); }
-				else if( c[i]->throughput >= INT64_C( 1000000000000    ) )
-				       { wprintw( main_window, "[%llu GB/s] ", c[i]->throughput / INT64_C( 1000000000    ) ); }
 				else if( c[i]->throughput >= INT64_C( 1000000000       ) )
-				       { wprintw( main_window, "[%llu MB/s] ", c[i]->throughput / INT64_C( 1000000       ) ); }
+				       { wprintw( main_window, "[%llu GB/s] ", c[i]->throughput / INT64_C( 1000000000    ) ); }
 				else if( c[i]->throughput >= INT64_C( 1000000          ) )
+				       { wprintw( main_window, "[%llu MB/s] ", c[i]->throughput / INT64_C( 1000000       ) ); }
+				else if( c[i]->throughput >= INT64_C( 1000             ) )
 				       { wprintw( main_window, "[%llu KB/s] ", c[i]->throughput / INT64_C( 1000          ) ); }
 				else
 				       { wprintw( main_window, "[%llu B/s] ",  c[i]->throughput / INT64_C( 1             ) ); }
@@ -1909,13 +1909,13 @@ void *nwipe_gui_status( void *ptr )
 
 
 			u64 nwipe_throughput = nwipe_misc_thread_data->throughput;
-			     if( nwipe_throughput >= INT64_C( 1000000000000000 ) )
+			     if( nwipe_throughput >= INT64_C( 1000000000000    ) )
 				    { nwipe_throughput /= INT64_C( 1000000000000    ); nwipe_format = nwipe_tera; }
-			else if( nwipe_throughput >= INT64_C( 1000000000000    ) )
-			       { nwipe_throughput /= INT64_C( 1000000000       ); nwipe_format = nwipe_giga; }
 			else if( nwipe_throughput >= INT64_C( 1000000000       ) )
-			       { nwipe_throughput /= INT64_C( 1000000          ); nwipe_format = nwipe_mega; }
+			       { nwipe_throughput /= INT64_C( 1000000000       ); nwipe_format = nwipe_giga; }
 			else if( nwipe_throughput >= INT64_C( 1000000          ) )
+			       { nwipe_throughput /= INT64_C( 1000000          ); nwipe_format = nwipe_mega; }
+			else if( nwipe_throughput >= INT64_C( 1000             ) )
 			       { nwipe_throughput /= INT64_C( 1000             ); nwipe_format = nwipe_kilo; }
 			else
 			       { nwipe_throughput /= INT64_C( 1                ); nwipe_format = nwipe_unit; }