Minor bug fixes
diff --git a/Makefile b/Makefile
index 3364082..4beac54 100644
--- a/Makefile
+++ b/Makefile
@@ -42,3 +42,487 @@
 	$(CRITICAL_CXX_FLAGS) 
 
 # DO NOT DELETE
+
+attributes.o: /usr/include/stdint.h /usr/include/features.h
+attributes.o: /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h
+attributes.o: /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h
+attributes.o: /usr/include/bits/wchar.h /usr/include/stdio.h
+attributes.o: /usr/include/bits/types.h /usr/include/bits/typesizes.h
+attributes.o: /usr/include/libio.h /usr/include/_G_config.h
+attributes.o: /usr/include/wchar.h /usr/include/bits/stdio_lim.h
+attributes.o: /usr/include/bits/sys_errlist.h attributes.h support.h
+attributes.o: /usr/include/stdlib.h /usr/include/bits/waitflags.h
+attributes.o: /usr/include/bits/waitstatus.h /usr/include/endian.h
+attributes.o: /usr/include/bits/endian.h /usr/include/bits/byteswap.h
+attributes.o: /usr/include/sys/types.h /usr/include/time.h
+attributes.o: /usr/include/sys/select.h /usr/include/bits/select.h
+attributes.o: /usr/include/bits/sigset.h /usr/include/bits/time.h
+attributes.o: /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h
+attributes.o: /usr/include/alloca.h
+basicmbr.o: /usr/include/stdio.h /usr/include/features.h
+basicmbr.o: /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h
+basicmbr.o: /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h
+basicmbr.o: /usr/include/bits/types.h /usr/include/bits/typesizes.h
+basicmbr.o: /usr/include/libio.h /usr/include/_G_config.h
+basicmbr.o: /usr/include/wchar.h /usr/include/bits/stdio_lim.h
+basicmbr.o: /usr/include/bits/sys_errlist.h /usr/include/stdlib.h
+basicmbr.o: /usr/include/bits/waitflags.h /usr/include/bits/waitstatus.h
+basicmbr.o: /usr/include/endian.h /usr/include/bits/endian.h
+basicmbr.o: /usr/include/bits/byteswap.h /usr/include/sys/types.h
+basicmbr.o: /usr/include/time.h /usr/include/sys/select.h
+basicmbr.o: /usr/include/bits/select.h /usr/include/bits/sigset.h
+basicmbr.o: /usr/include/bits/time.h /usr/include/sys/sysmacros.h
+basicmbr.o: /usr/include/bits/pthreadtypes.h /usr/include/alloca.h
+basicmbr.o: /usr/include/stdint.h /usr/include/bits/wchar.h
+basicmbr.o: /usr/include/fcntl.h /usr/include/bits/fcntl.h
+basicmbr.o: /usr/include/bits/stat.h /usr/include/string.h
+basicmbr.o: /usr/include/xlocale.h /usr/include/sys/stat.h
+basicmbr.o: /usr/include/errno.h /usr/include/bits/errno.h
+basicmbr.o: /usr/include/linux/errno.h /usr/include/asm/errno.h
+basicmbr.o: /usr/include/asm-generic/errno.h
+basicmbr.o: /usr/include/asm-generic/errno-base.h mbr.h gptpart.h support.h
+basicmbr.o: parttypes.h guid.h /usr/include/uuid/uuid.h
+basicmbr.o: /usr/include/sys/time.h attributes.h diskio.h
+basicmbr.o: /usr/include/sys/ioctl.h /usr/include/bits/ioctls.h
+basicmbr.o: /usr/include/asm/ioctls.h /usr/include/asm-generic/ioctls.h
+basicmbr.o: /usr/include/linux/ioctl.h /usr/include/asm/ioctl.h
+basicmbr.o: /usr/include/asm-generic/ioctl.h /usr/include/bits/ioctl-types.h
+basicmbr.o: /usr/include/sys/ttydefaults.h basicmbr.h mbrpart.h
+bsd.o: /usr/include/stdio.h /usr/include/features.h /usr/include/sys/cdefs.h
+bsd.o: /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h
+bsd.o: /usr/include/gnu/stubs-64.h /usr/include/bits/types.h
+bsd.o: /usr/include/bits/typesizes.h /usr/include/libio.h
+bsd.o: /usr/include/_G_config.h /usr/include/wchar.h
+bsd.o: /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h
+bsd.o: /usr/include/stdlib.h /usr/include/bits/waitflags.h
+bsd.o: /usr/include/bits/waitstatus.h /usr/include/endian.h
+bsd.o: /usr/include/bits/endian.h /usr/include/bits/byteswap.h
+bsd.o: /usr/include/sys/types.h /usr/include/time.h /usr/include/sys/select.h
+bsd.o: /usr/include/bits/select.h /usr/include/bits/sigset.h
+bsd.o: /usr/include/bits/time.h /usr/include/sys/sysmacros.h
+bsd.o: /usr/include/bits/pthreadtypes.h /usr/include/alloca.h
+bsd.o: /usr/include/stdint.h /usr/include/bits/wchar.h /usr/include/fcntl.h
+bsd.o: /usr/include/bits/fcntl.h /usr/include/bits/stat.h
+bsd.o: /usr/include/sys/stat.h /usr/include/errno.h /usr/include/bits/errno.h
+bsd.o: /usr/include/linux/errno.h /usr/include/asm/errno.h
+bsd.o: /usr/include/asm-generic/errno.h /usr/include/asm-generic/errno-base.h
+bsd.o: support.h bsd.h gptpart.h parttypes.h guid.h /usr/include/uuid/uuid.h
+bsd.o: /usr/include/sys/time.h attributes.h diskio.h /usr/include/sys/ioctl.h
+bsd.o: /usr/include/bits/ioctls.h /usr/include/asm/ioctls.h
+bsd.o: /usr/include/asm-generic/ioctls.h /usr/include/linux/ioctl.h
+bsd.o: /usr/include/asm/ioctl.h /usr/include/asm-generic/ioctl.h
+bsd.o: /usr/include/bits/ioctl-types.h /usr/include/sys/ttydefaults.h
+cgdisk.o: gptcurses.h gptpart.h /usr/include/stdint.h /usr/include/features.h
+cgdisk.o: /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h
+cgdisk.o: /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h
+cgdisk.o: /usr/include/bits/wchar.h /usr/include/sys/types.h
+cgdisk.o: /usr/include/bits/types.h /usr/include/bits/typesizes.h
+cgdisk.o: /usr/include/time.h /usr/include/endian.h
+cgdisk.o: /usr/include/bits/endian.h /usr/include/bits/byteswap.h
+cgdisk.o: /usr/include/sys/select.h /usr/include/bits/select.h
+cgdisk.o: /usr/include/bits/sigset.h /usr/include/bits/time.h
+cgdisk.o: /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h
+cgdisk.o: support.h /usr/include/stdlib.h /usr/include/bits/waitflags.h
+cgdisk.o: /usr/include/bits/waitstatus.h /usr/include/alloca.h parttypes.h
+cgdisk.o: guid.h /usr/include/uuid/uuid.h /usr/include/sys/time.h
+cgdisk.o: attributes.h gpt.h mbr.h diskio.h /usr/include/sys/ioctl.h
+cgdisk.o: /usr/include/bits/ioctls.h /usr/include/asm/ioctls.h
+cgdisk.o: /usr/include/asm-generic/ioctls.h /usr/include/linux/ioctl.h
+cgdisk.o: /usr/include/asm/ioctl.h /usr/include/asm-generic/ioctl.h
+cgdisk.o: /usr/include/bits/ioctl-types.h /usr/include/sys/ttydefaults.h
+cgdisk.o: basicmbr.h mbrpart.h bsd.h
+crc32.o: /usr/include/stdio.h /usr/include/features.h
+crc32.o: /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h
+crc32.o: /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h
+crc32.o: /usr/include/bits/types.h /usr/include/bits/typesizes.h
+crc32.o: /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h
+crc32.o: /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h
+crc32.o: /usr/include/stdlib.h /usr/include/bits/waitflags.h
+crc32.o: /usr/include/bits/waitstatus.h /usr/include/endian.h
+crc32.o: /usr/include/bits/endian.h /usr/include/bits/byteswap.h
+crc32.o: /usr/include/sys/types.h /usr/include/time.h
+crc32.o: /usr/include/sys/select.h /usr/include/bits/select.h
+crc32.o: /usr/include/bits/sigset.h /usr/include/bits/time.h
+crc32.o: /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h
+crc32.o: /usr/include/alloca.h crc32.h /usr/include/stdint.h
+crc32.o: /usr/include/bits/wchar.h
+diskio.o: /usr/include/sys/ioctl.h /usr/include/features.h
+diskio.o: /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h
+diskio.o: /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h
+diskio.o: /usr/include/bits/ioctls.h /usr/include/asm/ioctls.h
+diskio.o: /usr/include/asm-generic/ioctls.h /usr/include/linux/ioctl.h
+diskio.o: /usr/include/asm/ioctl.h /usr/include/asm-generic/ioctl.h
+diskio.o: /usr/include/bits/ioctl-types.h /usr/include/sys/ttydefaults.h
+diskio.o: /usr/include/stdint.h /usr/include/bits/wchar.h
+diskio.o: /usr/include/errno.h /usr/include/bits/errno.h
+diskio.o: /usr/include/linux/errno.h /usr/include/asm/errno.h
+diskio.o: /usr/include/asm-generic/errno.h
+diskio.o: /usr/include/asm-generic/errno-base.h /usr/include/fcntl.h
+diskio.o: /usr/include/bits/fcntl.h /usr/include/sys/types.h
+diskio.o: /usr/include/bits/types.h /usr/include/bits/typesizes.h
+diskio.o: /usr/include/time.h /usr/include/endian.h
+diskio.o: /usr/include/bits/endian.h /usr/include/bits/byteswap.h
+diskio.o: /usr/include/sys/select.h /usr/include/bits/select.h
+diskio.o: /usr/include/bits/sigset.h /usr/include/bits/time.h
+diskio.o: /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h
+diskio.o: /usr/include/bits/stat.h /usr/include/sys/stat.h support.h
+diskio.o: /usr/include/stdlib.h /usr/include/bits/waitflags.h
+diskio.o: /usr/include/bits/waitstatus.h /usr/include/alloca.h diskio.h
+diskio-unix.o: /usr/include/sys/ioctl.h /usr/include/features.h
+diskio-unix.o: /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h
+diskio-unix.o: /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h
+diskio-unix.o: /usr/include/bits/ioctls.h /usr/include/asm/ioctls.h
+diskio-unix.o: /usr/include/asm-generic/ioctls.h /usr/include/linux/ioctl.h
+diskio-unix.o: /usr/include/asm/ioctl.h /usr/include/asm-generic/ioctl.h
+diskio-unix.o: /usr/include/bits/ioctl-types.h /usr/include/sys/ttydefaults.h
+diskio-unix.o: /usr/include/string.h /usr/include/xlocale.h
+diskio-unix.o: /usr/include/stdint.h /usr/include/bits/wchar.h
+diskio-unix.o: /usr/include/errno.h /usr/include/bits/errno.h
+diskio-unix.o: /usr/include/linux/errno.h /usr/include/asm/errno.h
+diskio-unix.o: /usr/include/asm-generic/errno.h
+diskio-unix.o: /usr/include/asm-generic/errno-base.h /usr/include/fcntl.h
+diskio-unix.o: /usr/include/bits/fcntl.h /usr/include/sys/types.h
+diskio-unix.o: /usr/include/bits/types.h /usr/include/bits/typesizes.h
+diskio-unix.o: /usr/include/time.h /usr/include/endian.h
+diskio-unix.o: /usr/include/bits/endian.h /usr/include/bits/byteswap.h
+diskio-unix.o: /usr/include/sys/select.h /usr/include/bits/select.h
+diskio-unix.o: /usr/include/bits/sigset.h /usr/include/bits/time.h
+diskio-unix.o: /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h
+diskio-unix.o: /usr/include/bits/stat.h /usr/include/sys/stat.h diskio.h
+diskio-unix.o: support.h /usr/include/stdlib.h /usr/include/bits/waitflags.h
+diskio-unix.o: /usr/include/bits/waitstatus.h /usr/include/alloca.h
+diskio-windows.o: /usr/include/stdio.h /usr/include/features.h
+diskio-windows.o: /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h
+diskio-windows.o: /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h
+diskio-windows.o: /usr/include/bits/types.h /usr/include/bits/typesizes.h
+diskio-windows.o: /usr/include/libio.h /usr/include/_G_config.h
+diskio-windows.o: /usr/include/wchar.h /usr/include/bits/stdio_lim.h
+diskio-windows.o: /usr/include/bits/sys_errlist.h /usr/include/stdint.h
+diskio-windows.o: /usr/include/bits/wchar.h /usr/include/errno.h
+diskio-windows.o: /usr/include/bits/errno.h /usr/include/linux/errno.h
+diskio-windows.o: /usr/include/asm/errno.h /usr/include/asm-generic/errno.h
+diskio-windows.o: /usr/include/asm-generic/errno-base.h /usr/include/fcntl.h
+diskio-windows.o: /usr/include/bits/fcntl.h /usr/include/sys/types.h
+diskio-windows.o: /usr/include/time.h /usr/include/endian.h
+diskio-windows.o: /usr/include/bits/endian.h /usr/include/bits/byteswap.h
+diskio-windows.o: /usr/include/sys/select.h /usr/include/bits/select.h
+diskio-windows.o: /usr/include/bits/sigset.h /usr/include/bits/time.h
+diskio-windows.o: /usr/include/sys/sysmacros.h
+diskio-windows.o: /usr/include/bits/pthreadtypes.h /usr/include/bits/stat.h
+diskio-windows.o: /usr/include/sys/stat.h support.h /usr/include/stdlib.h
+diskio-windows.o: /usr/include/bits/waitflags.h
+diskio-windows.o: /usr/include/bits/waitstatus.h /usr/include/alloca.h
+diskio-windows.o: diskio.h /usr/include/sys/ioctl.h
+diskio-windows.o: /usr/include/bits/ioctls.h /usr/include/asm/ioctls.h
+diskio-windows.o: /usr/include/asm-generic/ioctls.h
+diskio-windows.o: /usr/include/linux/ioctl.h /usr/include/asm/ioctl.h
+diskio-windows.o: /usr/include/asm-generic/ioctl.h
+diskio-windows.o: /usr/include/bits/ioctl-types.h
+diskio-windows.o: /usr/include/sys/ttydefaults.h
+fixparts.o: /usr/include/stdio.h /usr/include/features.h
+fixparts.o: /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h
+fixparts.o: /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h
+fixparts.o: /usr/include/bits/types.h /usr/include/bits/typesizes.h
+fixparts.o: /usr/include/libio.h /usr/include/_G_config.h
+fixparts.o: /usr/include/wchar.h /usr/include/bits/stdio_lim.h
+fixparts.o: /usr/include/bits/sys_errlist.h /usr/include/string.h
+fixparts.o: /usr/include/xlocale.h basicmbr.h /usr/include/stdint.h
+fixparts.o: /usr/include/bits/wchar.h /usr/include/sys/types.h
+fixparts.o: /usr/include/time.h /usr/include/endian.h
+fixparts.o: /usr/include/bits/endian.h /usr/include/bits/byteswap.h
+fixparts.o: /usr/include/sys/select.h /usr/include/bits/select.h
+fixparts.o: /usr/include/bits/sigset.h /usr/include/bits/time.h
+fixparts.o: /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h
+fixparts.o: diskio.h /usr/include/sys/ioctl.h /usr/include/bits/ioctls.h
+fixparts.o: /usr/include/asm/ioctls.h /usr/include/asm-generic/ioctls.h
+fixparts.o: /usr/include/linux/ioctl.h /usr/include/asm/ioctl.h
+fixparts.o: /usr/include/asm-generic/ioctl.h /usr/include/bits/ioctl-types.h
+fixparts.o: /usr/include/sys/ttydefaults.h support.h /usr/include/stdlib.h
+fixparts.o: /usr/include/bits/waitflags.h /usr/include/bits/waitstatus.h
+fixparts.o: /usr/include/alloca.h mbrpart.h
+gdisk.o: /usr/include/string.h /usr/include/features.h
+gdisk.o: /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h
+gdisk.o: /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h
+gdisk.o: /usr/include/xlocale.h gpttext.h gpt.h /usr/include/stdint.h
+gdisk.o: /usr/include/bits/wchar.h /usr/include/sys/types.h
+gdisk.o: /usr/include/bits/types.h /usr/include/bits/typesizes.h
+gdisk.o: /usr/include/time.h /usr/include/endian.h /usr/include/bits/endian.h
+gdisk.o: /usr/include/bits/byteswap.h /usr/include/sys/select.h
+gdisk.o: /usr/include/bits/select.h /usr/include/bits/sigset.h
+gdisk.o: /usr/include/bits/time.h /usr/include/sys/sysmacros.h
+gdisk.o: /usr/include/bits/pthreadtypes.h gptpart.h support.h
+gdisk.o: /usr/include/stdlib.h /usr/include/bits/waitflags.h
+gdisk.o: /usr/include/bits/waitstatus.h /usr/include/alloca.h parttypes.h
+gdisk.o: guid.h /usr/include/uuid/uuid.h /usr/include/sys/time.h attributes.h
+gdisk.o: mbr.h diskio.h /usr/include/sys/ioctl.h /usr/include/bits/ioctls.h
+gdisk.o: /usr/include/asm/ioctls.h /usr/include/asm-generic/ioctls.h
+gdisk.o: /usr/include/linux/ioctl.h /usr/include/asm/ioctl.h
+gdisk.o: /usr/include/asm-generic/ioctl.h /usr/include/bits/ioctl-types.h
+gdisk.o: /usr/include/sys/ttydefaults.h basicmbr.h mbrpart.h bsd.h
+gpt.o: /usr/include/stdio.h /usr/include/features.h /usr/include/sys/cdefs.h
+gpt.o: /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h
+gpt.o: /usr/include/gnu/stubs-64.h /usr/include/bits/types.h
+gpt.o: /usr/include/bits/typesizes.h /usr/include/libio.h
+gpt.o: /usr/include/_G_config.h /usr/include/wchar.h
+gpt.o: /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h
+gpt.o: /usr/include/stdlib.h /usr/include/bits/waitflags.h
+gpt.o: /usr/include/bits/waitstatus.h /usr/include/endian.h
+gpt.o: /usr/include/bits/endian.h /usr/include/bits/byteswap.h
+gpt.o: /usr/include/sys/types.h /usr/include/time.h /usr/include/sys/select.h
+gpt.o: /usr/include/bits/select.h /usr/include/bits/sigset.h
+gpt.o: /usr/include/bits/time.h /usr/include/sys/sysmacros.h
+gpt.o: /usr/include/bits/pthreadtypes.h /usr/include/alloca.h
+gpt.o: /usr/include/stdint.h /usr/include/bits/wchar.h /usr/include/fcntl.h
+gpt.o: /usr/include/bits/fcntl.h /usr/include/bits/stat.h
+gpt.o: /usr/include/string.h /usr/include/xlocale.h /usr/include/math.h
+gpt.o: /usr/include/bits/huge_val.h /usr/include/bits/huge_valf.h
+gpt.o: /usr/include/bits/huge_vall.h /usr/include/bits/inf.h
+gpt.o: /usr/include/bits/nan.h /usr/include/bits/mathdef.h
+gpt.o: /usr/include/bits/mathcalls.h /usr/include/sys/stat.h
+gpt.o: /usr/include/errno.h /usr/include/bits/errno.h
+gpt.o: /usr/include/linux/errno.h /usr/include/asm/errno.h
+gpt.o: /usr/include/asm-generic/errno.h /usr/include/asm-generic/errno-base.h
+gpt.o: crc32.h gpt.h gptpart.h support.h parttypes.h guid.h
+gpt.o: /usr/include/uuid/uuid.h /usr/include/sys/time.h attributes.h mbr.h
+gpt.o: diskio.h /usr/include/sys/ioctl.h /usr/include/bits/ioctls.h
+gpt.o: /usr/include/asm/ioctls.h /usr/include/asm-generic/ioctls.h
+gpt.o: /usr/include/linux/ioctl.h /usr/include/asm/ioctl.h
+gpt.o: /usr/include/asm-generic/ioctl.h /usr/include/bits/ioctl-types.h
+gpt.o: /usr/include/sys/ttydefaults.h basicmbr.h mbrpart.h bsd.h
+gptcl.o: /usr/include/string.h /usr/include/features.h
+gptcl.o: /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h
+gptcl.o: /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h
+gptcl.o: /usr/include/xlocale.h /usr/include/errno.h
+gptcl.o: /usr/include/bits/errno.h /usr/include/linux/errno.h
+gptcl.o: /usr/include/asm/errno.h /usr/include/asm-generic/errno.h
+gptcl.o: /usr/include/asm-generic/errno-base.h /usr/include/popt.h
+gptcl.o: /usr/include/stdio.h /usr/include/bits/types.h
+gptcl.o: /usr/include/bits/typesizes.h /usr/include/libio.h
+gptcl.o: /usr/include/_G_config.h /usr/include/wchar.h
+gptcl.o: /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h
+gptcl.o: gptcl.h gpt.h /usr/include/stdint.h /usr/include/bits/wchar.h
+gptcl.o: /usr/include/sys/types.h /usr/include/time.h /usr/include/endian.h
+gptcl.o: /usr/include/bits/endian.h /usr/include/bits/byteswap.h
+gptcl.o: /usr/include/sys/select.h /usr/include/bits/select.h
+gptcl.o: /usr/include/bits/sigset.h /usr/include/bits/time.h
+gptcl.o: /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h
+gptcl.o: gptpart.h support.h /usr/include/stdlib.h
+gptcl.o: /usr/include/bits/waitflags.h /usr/include/bits/waitstatus.h
+gptcl.o: /usr/include/alloca.h parttypes.h guid.h /usr/include/uuid/uuid.h
+gptcl.o: /usr/include/sys/time.h attributes.h mbr.h diskio.h
+gptcl.o: /usr/include/sys/ioctl.h /usr/include/bits/ioctls.h
+gptcl.o: /usr/include/asm/ioctls.h /usr/include/asm-generic/ioctls.h
+gptcl.o: /usr/include/linux/ioctl.h /usr/include/asm/ioctl.h
+gptcl.o: /usr/include/asm-generic/ioctl.h /usr/include/bits/ioctl-types.h
+gptcl.o: /usr/include/sys/ttydefaults.h basicmbr.h mbrpart.h bsd.h
+gptcurses.o: /usr/include/ncurses.h /usr/include/ncurses_dll.h
+gptcurses.o: /usr/include/stdio.h /usr/include/features.h
+gptcurses.o: /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h
+gptcurses.o: /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h
+gptcurses.o: /usr/include/bits/types.h /usr/include/bits/typesizes.h
+gptcurses.o: /usr/include/libio.h /usr/include/_G_config.h
+gptcurses.o: /usr/include/wchar.h /usr/include/bits/stdio_lim.h
+gptcurses.o: /usr/include/bits/sys_errlist.h /usr/include/unctrl.h
+gptcurses.o: /usr/include/curses.h gptcurses.h gptpart.h
+gptcurses.o: /usr/include/stdint.h /usr/include/bits/wchar.h
+gptcurses.o: /usr/include/sys/types.h /usr/include/time.h
+gptcurses.o: /usr/include/endian.h /usr/include/bits/endian.h
+gptcurses.o: /usr/include/bits/byteswap.h /usr/include/sys/select.h
+gptcurses.o: /usr/include/bits/select.h /usr/include/bits/sigset.h
+gptcurses.o: /usr/include/bits/time.h /usr/include/sys/sysmacros.h
+gptcurses.o: /usr/include/bits/pthreadtypes.h support.h /usr/include/stdlib.h
+gptcurses.o: /usr/include/bits/waitflags.h /usr/include/bits/waitstatus.h
+gptcurses.o: /usr/include/alloca.h parttypes.h guid.h
+gptcurses.o: /usr/include/uuid/uuid.h /usr/include/sys/time.h attributes.h
+gptcurses.o: gpt.h mbr.h diskio.h /usr/include/sys/ioctl.h
+gptcurses.o: /usr/include/bits/ioctls.h /usr/include/asm/ioctls.h
+gptcurses.o: /usr/include/asm-generic/ioctls.h /usr/include/linux/ioctl.h
+gptcurses.o: /usr/include/asm/ioctl.h /usr/include/asm-generic/ioctl.h
+gptcurses.o: /usr/include/bits/ioctl-types.h /usr/include/sys/ttydefaults.h
+gptcurses.o: basicmbr.h mbrpart.h bsd.h
+gptpart.o: /usr/include/string.h /usr/include/features.h
+gptpart.o: /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h
+gptpart.o: /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h
+gptpart.o: /usr/include/xlocale.h /usr/include/stdio.h
+gptpart.o: /usr/include/bits/types.h /usr/include/bits/typesizes.h
+gptpart.o: /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h
+gptpart.o: /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h
+gptpart.o: gptpart.h /usr/include/stdint.h /usr/include/bits/wchar.h
+gptpart.o: /usr/include/sys/types.h /usr/include/time.h /usr/include/endian.h
+gptpart.o: /usr/include/bits/endian.h /usr/include/bits/byteswap.h
+gptpart.o: /usr/include/sys/select.h /usr/include/bits/select.h
+gptpart.o: /usr/include/bits/sigset.h /usr/include/bits/time.h
+gptpart.o: /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h
+gptpart.o: support.h /usr/include/stdlib.h /usr/include/bits/waitflags.h
+gptpart.o: /usr/include/bits/waitstatus.h /usr/include/alloca.h parttypes.h
+gptpart.o: guid.h /usr/include/uuid/uuid.h /usr/include/sys/time.h
+gptpart.o: attributes.h
+gpttext.o: /usr/include/string.h /usr/include/features.h
+gpttext.o: /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h
+gpttext.o: /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h
+gpttext.o: /usr/include/xlocale.h /usr/include/errno.h
+gpttext.o: /usr/include/bits/errno.h /usr/include/linux/errno.h
+gpttext.o: /usr/include/asm/errno.h /usr/include/asm-generic/errno.h
+gpttext.o: /usr/include/asm-generic/errno-base.h /usr/include/stdint.h
+gpttext.o: /usr/include/bits/wchar.h /usr/include/limits.h
+gpttext.o: /usr/include/bits/posix1_lim.h /usr/include/bits/local_lim.h
+gpttext.o: /usr/include/linux/limits.h /usr/include/bits/posix2_lim.h
+gpttext.o: attributes.h gpttext.h gpt.h /usr/include/sys/types.h
+gpttext.o: /usr/include/bits/types.h /usr/include/bits/typesizes.h
+gpttext.o: /usr/include/time.h /usr/include/endian.h
+gpttext.o: /usr/include/bits/endian.h /usr/include/bits/byteswap.h
+gpttext.o: /usr/include/sys/select.h /usr/include/bits/select.h
+gpttext.o: /usr/include/bits/sigset.h /usr/include/bits/time.h
+gpttext.o: /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h
+gpttext.o: gptpart.h support.h /usr/include/stdlib.h
+gpttext.o: /usr/include/bits/waitflags.h /usr/include/bits/waitstatus.h
+gpttext.o: /usr/include/alloca.h parttypes.h guid.h /usr/include/uuid/uuid.h
+gpttext.o: /usr/include/sys/time.h mbr.h diskio.h /usr/include/sys/ioctl.h
+gpttext.o: /usr/include/bits/ioctls.h /usr/include/asm/ioctls.h
+gpttext.o: /usr/include/asm-generic/ioctls.h /usr/include/linux/ioctl.h
+gpttext.o: /usr/include/asm/ioctl.h /usr/include/asm-generic/ioctl.h
+gpttext.o: /usr/include/bits/ioctl-types.h /usr/include/sys/ttydefaults.h
+gpttext.o: basicmbr.h mbrpart.h bsd.h
+guid.o: /usr/include/stdio.h /usr/include/features.h /usr/include/sys/cdefs.h
+guid.o: /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h
+guid.o: /usr/include/gnu/stubs-64.h /usr/include/bits/types.h
+guid.o: /usr/include/bits/typesizes.h /usr/include/libio.h
+guid.o: /usr/include/_G_config.h /usr/include/wchar.h
+guid.o: /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h
+guid.o: /usr/include/time.h /usr/include/string.h /usr/include/xlocale.h
+guid.o: guid.h /usr/include/stdint.h /usr/include/bits/wchar.h
+guid.o: /usr/include/uuid/uuid.h /usr/include/sys/types.h
+guid.o: /usr/include/endian.h /usr/include/bits/endian.h
+guid.o: /usr/include/bits/byteswap.h /usr/include/sys/select.h
+guid.o: /usr/include/bits/select.h /usr/include/bits/sigset.h
+guid.o: /usr/include/bits/time.h /usr/include/sys/sysmacros.h
+guid.o: /usr/include/bits/pthreadtypes.h /usr/include/sys/time.h support.h
+guid.o: /usr/include/stdlib.h /usr/include/bits/waitflags.h
+guid.o: /usr/include/bits/waitstatus.h /usr/include/alloca.h
+mbr.o: /usr/include/stdio.h /usr/include/features.h /usr/include/sys/cdefs.h
+mbr.o: /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h
+mbr.o: /usr/include/gnu/stubs-64.h /usr/include/bits/types.h
+mbr.o: /usr/include/bits/typesizes.h /usr/include/libio.h
+mbr.o: /usr/include/_G_config.h /usr/include/wchar.h
+mbr.o: /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h
+mbr.o: /usr/include/stdlib.h /usr/include/bits/waitflags.h
+mbr.o: /usr/include/bits/waitstatus.h /usr/include/endian.h
+mbr.o: /usr/include/bits/endian.h /usr/include/bits/byteswap.h
+mbr.o: /usr/include/sys/types.h /usr/include/time.h /usr/include/sys/select.h
+mbr.o: /usr/include/bits/select.h /usr/include/bits/sigset.h
+mbr.o: /usr/include/bits/time.h /usr/include/sys/sysmacros.h
+mbr.o: /usr/include/bits/pthreadtypes.h /usr/include/alloca.h
+mbr.o: /usr/include/stdint.h /usr/include/bits/wchar.h /usr/include/fcntl.h
+mbr.o: /usr/include/bits/fcntl.h /usr/include/bits/stat.h
+mbr.o: /usr/include/string.h /usr/include/xlocale.h /usr/include/sys/stat.h
+mbr.o: /usr/include/errno.h /usr/include/bits/errno.h
+mbr.o: /usr/include/linux/errno.h /usr/include/asm/errno.h
+mbr.o: /usr/include/asm-generic/errno.h /usr/include/asm-generic/errno-base.h
+mbr.o: mbr.h gptpart.h support.h parttypes.h guid.h /usr/include/uuid/uuid.h
+mbr.o: /usr/include/sys/time.h attributes.h diskio.h /usr/include/sys/ioctl.h
+mbr.o: /usr/include/bits/ioctls.h /usr/include/asm/ioctls.h
+mbr.o: /usr/include/asm-generic/ioctls.h /usr/include/linux/ioctl.h
+mbr.o: /usr/include/asm/ioctl.h /usr/include/asm-generic/ioctl.h
+mbr.o: /usr/include/bits/ioctl-types.h /usr/include/sys/ttydefaults.h
+mbr.o: basicmbr.h mbrpart.h
+mbrpart.o: /usr/include/stdint.h /usr/include/features.h
+mbrpart.o: /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h
+mbrpart.o: /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h
+mbrpart.o: /usr/include/bits/wchar.h support.h /usr/include/stdlib.h
+mbrpart.o: /usr/include/bits/waitflags.h /usr/include/bits/waitstatus.h
+mbrpart.o: /usr/include/endian.h /usr/include/bits/endian.h
+mbrpart.o: /usr/include/bits/byteswap.h /usr/include/sys/types.h
+mbrpart.o: /usr/include/bits/types.h /usr/include/bits/typesizes.h
+mbrpart.o: /usr/include/time.h /usr/include/sys/select.h
+mbrpart.o: /usr/include/bits/select.h /usr/include/bits/sigset.h
+mbrpart.o: /usr/include/bits/time.h /usr/include/sys/sysmacros.h
+mbrpart.o: /usr/include/bits/pthreadtypes.h /usr/include/alloca.h mbrpart.h
+parttypes.o: /usr/include/string.h /usr/include/features.h
+parttypes.o: /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h
+parttypes.o: /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h
+parttypes.o: /usr/include/xlocale.h /usr/include/stdint.h
+parttypes.o: /usr/include/bits/wchar.h /usr/include/stdio.h
+parttypes.o: /usr/include/bits/types.h /usr/include/bits/typesizes.h
+parttypes.o: /usr/include/libio.h /usr/include/_G_config.h
+parttypes.o: /usr/include/wchar.h /usr/include/bits/stdio_lim.h
+parttypes.o: /usr/include/bits/sys_errlist.h parttypes.h
+parttypes.o: /usr/include/stdlib.h /usr/include/bits/waitflags.h
+parttypes.o: /usr/include/bits/waitstatus.h /usr/include/endian.h
+parttypes.o: /usr/include/bits/endian.h /usr/include/bits/byteswap.h
+parttypes.o: /usr/include/sys/types.h /usr/include/time.h
+parttypes.o: /usr/include/sys/select.h /usr/include/bits/select.h
+parttypes.o: /usr/include/bits/sigset.h /usr/include/bits/time.h
+parttypes.o: /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h
+parttypes.o: /usr/include/alloca.h support.h guid.h /usr/include/uuid/uuid.h
+parttypes.o: /usr/include/sys/time.h
+sgdisk.o: gptcl.h gpt.h /usr/include/stdint.h /usr/include/features.h
+sgdisk.o: /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h
+sgdisk.o: /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h
+sgdisk.o: /usr/include/bits/wchar.h /usr/include/sys/types.h
+sgdisk.o: /usr/include/bits/types.h /usr/include/bits/typesizes.h
+sgdisk.o: /usr/include/time.h /usr/include/endian.h
+sgdisk.o: /usr/include/bits/endian.h /usr/include/bits/byteswap.h
+sgdisk.o: /usr/include/sys/select.h /usr/include/bits/select.h
+sgdisk.o: /usr/include/bits/sigset.h /usr/include/bits/time.h
+sgdisk.o: /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h
+sgdisk.o: gptpart.h support.h /usr/include/stdlib.h
+sgdisk.o: /usr/include/bits/waitflags.h /usr/include/bits/waitstatus.h
+sgdisk.o: /usr/include/alloca.h parttypes.h guid.h /usr/include/uuid/uuid.h
+sgdisk.o: /usr/include/sys/time.h attributes.h mbr.h diskio.h
+sgdisk.o: /usr/include/sys/ioctl.h /usr/include/bits/ioctls.h
+sgdisk.o: /usr/include/asm/ioctls.h /usr/include/asm-generic/ioctls.h
+sgdisk.o: /usr/include/linux/ioctl.h /usr/include/asm/ioctl.h
+sgdisk.o: /usr/include/asm-generic/ioctl.h /usr/include/bits/ioctl-types.h
+sgdisk.o: /usr/include/sys/ttydefaults.h basicmbr.h mbrpart.h bsd.h
+sgdisk.o: /usr/include/popt.h /usr/include/stdio.h /usr/include/libio.h
+sgdisk.o: /usr/include/_G_config.h /usr/include/wchar.h
+sgdisk.o: /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h
+support.o: /usr/include/stdio.h /usr/include/features.h
+support.o: /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h
+support.o: /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h
+support.o: /usr/include/bits/types.h /usr/include/bits/typesizes.h
+support.o: /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h
+support.o: /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h
+support.o: /usr/include/stdint.h /usr/include/bits/wchar.h
+support.o: /usr/include/errno.h /usr/include/bits/errno.h
+support.o: /usr/include/linux/errno.h /usr/include/asm/errno.h
+support.o: /usr/include/asm-generic/errno.h
+support.o: /usr/include/asm-generic/errno-base.h /usr/include/fcntl.h
+support.o: /usr/include/bits/fcntl.h /usr/include/sys/types.h
+support.o: /usr/include/time.h /usr/include/endian.h
+support.o: /usr/include/bits/endian.h /usr/include/bits/byteswap.h
+support.o: /usr/include/sys/select.h /usr/include/bits/select.h
+support.o: /usr/include/bits/sigset.h /usr/include/bits/time.h
+support.o: /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h
+support.o: /usr/include/bits/stat.h /usr/include/string.h
+support.o: /usr/include/xlocale.h /usr/include/sys/stat.h support.h
+support.o: /usr/include/stdlib.h /usr/include/bits/waitflags.h
+support.o: /usr/include/bits/waitstatus.h /usr/include/alloca.h
+test.o: /usr/include/stdio.h /usr/include/features.h /usr/include/sys/cdefs.h
+test.o: /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h
+test.o: /usr/include/gnu/stubs-64.h /usr/include/bits/types.h
+test.o: /usr/include/bits/typesizes.h /usr/include/libio.h
+test.o: /usr/include/_G_config.h /usr/include/wchar.h
+test.o: /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h
+test.o: support.h /usr/include/stdint.h /usr/include/bits/wchar.h
+test.o: /usr/include/stdlib.h /usr/include/bits/waitflags.h
+test.o: /usr/include/bits/waitstatus.h /usr/include/endian.h
+test.o: /usr/include/bits/endian.h /usr/include/bits/byteswap.h
+test.o: /usr/include/sys/types.h /usr/include/time.h
+test.o: /usr/include/sys/select.h /usr/include/bits/select.h
+test.o: /usr/include/bits/sigset.h /usr/include/bits/time.h
+test.o: /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h
+test.o: /usr/include/alloca.h
+testguid.o: guid.h /usr/include/stdint.h /usr/include/features.h
+testguid.o: /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h
+testguid.o: /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h
+testguid.o: /usr/include/bits/wchar.h /usr/include/uuid/uuid.h
+testguid.o: /usr/include/sys/types.h /usr/include/bits/types.h
+testguid.o: /usr/include/bits/typesizes.h /usr/include/time.h
+testguid.o: /usr/include/endian.h /usr/include/bits/endian.h
+testguid.o: /usr/include/bits/byteswap.h /usr/include/sys/select.h
+testguid.o: /usr/include/bits/select.h /usr/include/bits/sigset.h
+testguid.o: /usr/include/bits/time.h /usr/include/sys/sysmacros.h
+testguid.o: /usr/include/bits/pthreadtypes.h /usr/include/sys/time.h
+testguid.o: parttypes.h /usr/include/stdlib.h /usr/include/bits/waitflags.h
+testguid.o: /usr/include/bits/waitstatus.h /usr/include/alloca.h support.h
diff --git a/NEWS b/NEWS
index 7e62f33..bf7b0af 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,15 @@
+0.8.2 (??/??/2011):
+-------------------
+
+- Fixed a bug that caused an infinite loop of input prompts if the user
+  pressed Ctrl+D.
+
+- Changed gdisk's first-sector input operation to specify a sector number
+  that's properly aligned as the default value. This eliminates the need
+  to alter that value and notify the user of the change when the user
+  hits "Enter" for the default value as the first partition on an empty
+  disk (as well as in some other situations).
+
 0.8.1 (10/1/2011):
 ------------------
 
diff --git a/gpt.cc b/gpt.cc
index 76aaace..269e09b 100644
--- a/gpt.cc
+++ b/gpt.cc
@@ -968,11 +968,9 @@
 // Writes GPT (and protective MBR) to disk. If quiet==1, 
 // Returns 1 on successful write, 0 if there was a problem.
 int GPTData::SaveGPTData(int quiet) {
-   int allOK = 1, littleEndian;
+   int allOK = 1;
    char answer;
 
-   littleEndian = IsLittleEndian();
-
    // First do some final sanity checks....
 
    // This test should only fail on read-only disks....
@@ -1172,14 +1170,10 @@
 // set of partitions.
 int GPTData::LoadGPTBackup(const string & filename) {
    int allOK = 1, val, err;
-   uint32_t sizeOfEntries;
-   int littleEndian = 1, shortBackup = 0;
+   int shortBackup = 0;
    DiskIO backupFile;
 
    if (backupFile.OpenForRead(filename)) {
-      if (IsLittleEndian() == 0)
-         littleEndian = 0;
-
       // Let the MBRData class load the saved MBR...
       protectiveMBR.ReadMBRData(&backupFile, 0); // 0 = don't check block size
       protectiveMBR.SetDisk(&myDisk);
@@ -1207,10 +1201,8 @@
       if ((val = CheckHeaderValidity()) > 0) {
          if (val == 2) { // only backup header seems to be good
             SetGPTSize(secondHeader.numParts);
-            sizeOfEntries = secondHeader.sizeOfPartitionEntries;
          } else { // main header is OK
             SetGPTSize(mainHeader.numParts);
-            sizeOfEntries = mainHeader.sizeOfPartitionEntries;
          } // if/else
 
          if (secondHeader.currentLBA != diskSize - UINT64_C(1)) {
diff --git a/gpttext.cc b/gpttext.cc
index cd1c07a..7ceede5 100644
--- a/gpttext.cc
+++ b/gpttext.cc
@@ -194,6 +194,7 @@
        (firstFreePart < numParts)) {
       lastBlock = FindLastAvailable();
       firstInLargest = FindFirstInLargest();
+      Align(&firstInLargest);
 
       // Get partition number....
       do {
diff --git a/support.cc b/support.cc
index db5adb2..0a311a6 100644
--- a/support.cc
+++ b/support.cc
@@ -38,6 +38,8 @@
    string inString;
 
    getline(cin, inString);
+   if (!cin)
+      cin.clear();
    return inString;
 } // ReadString()
 
diff --git a/support.h b/support.h
index 020b177..bfbfa19 100644
--- a/support.h
+++ b/support.h
@@ -8,7 +8,7 @@
 #ifndef __GPTSUPPORT
 #define __GPTSUPPORT
 
-#define GPTFDISK_VERSION "0.8.1"
+#define GPTFDISK_VERSION "0.8.1.2"
 
 #if defined (__FreeBSD__) || defined (__FreeBSD_kernel__) || defined (__APPLE__)
 // Darwin (Mac OS) & FreeBSD: disk IOCTLs are different, and there is no lseek64