Some updates, need to parse them later

9 files changed, 82 insertions, 162 deletions

diff --git a/Makefile.in b/Makefile.in
index 44c7af4..dce1131 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -95,7 +95,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = config.h
+CONFIG_HEADER = $(top_builddir)/src/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 AM_V_P = $(am__v_P_@AM_V@)
@@ -164,8 +164,7 @@ am__recursive_targets = \
   $(am__extra_recursive_targets)
 AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
         cscope distdir dist dist-all distcheck
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
-        $(LISP)config.h.in
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 # Read a list of newline-separated strings from the standard input,
 # and print each of them once, without duplicates.  Input order is
 # *not* preserved.
@@ -186,9 +185,8 @@ ETAGS = etags
 CTAGS = ctags
 CSCOPE = cscope
 DIST_SUBDIRS = $(SUBDIRS)
-am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in AUTHORS \
-        COPYING ChangeLog INSTALL NEWS README compile depcomp \
-        install-sh missing
+am__DIST_COMMON = $(srcdir)/Makefile.in AUTHORS COPYING ChangeLog \
+        INSTALL NEWS README compile depcomp install-sh missing
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -325,8 +323,7 @@ AM_CPPFLAGS = -I$(srcdir) -I.
 man_MANS = docs/life.6
 EXTRA_DIST = $(man_MANS)
 SUBDIRS = docs src test
-all: config.h
-        $(MAKE) $(AM_MAKEFLAGS) all-recursive
+all: all-recursive
 
 .SUFFIXES:
 am--refresh: Makefile
@@ -362,21 +359,6 @@ $(top_srcdir)/configure:  $(am__configure_deps)
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
         $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 $(am__aclocal_m4_deps):
-
-config.h: stamp-h1
-        @test -f $@ || rm -f stamp-h1
-        @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
-
-stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
-        @rm -f stamp-h1
-        cd $(top_builddir) && $(SHELL) ./config.status config.h
-$(srcdir)/config.h.in:  $(am__configure_deps) 
-        ($(am__cd) $(top_srcdir) && $(AUTOHEADER))
-        rm -f stamp-h1
-        touch $@
-
-distclean-hdr:
-        -rm -f config.h stamp-h1
 install-man6: $(man_MANS)
         @$(NORMAL_INSTALL)
         @list1=''; \
@@ -592,7 +574,7 @@ distdir: $(DISTFILES)
           ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
         || chmod -R a+r "$(distdir)"
 dist-gzip: distdir
-        tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+        tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
         $(am__post_remove_distdir)
 
 dist-bzip2: distdir
@@ -618,7 +600,7 @@ dist-shar: distdir
         @echo WARNING: "Support for shar distribution archives is" \
                        "deprecated." >&2
         @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
-        shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+        shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
         $(am__post_remove_distdir)
 
 dist-zip: distdir
@@ -636,7 +618,7 @@ dist dist-all:
 distcheck: dist
         case '$(DIST_ARCHIVES)' in \
         *.tar.gz*) \
-          GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
+          eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
         *.tar.bz2*) \
           bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
         *.tar.lz*) \
@@ -646,7 +628,7 @@ distcheck: dist
         *.tar.Z*) \
           uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
         *.shar.gz*) \
-          GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
+          eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
         *.zip*) \
           unzip $(distdir).zip ;;\
         esac
@@ -717,7 +699,7 @@ distcleancheck: distclean
                exit 1; } >&2
 check-am: all-am
 check: check-recursive
-all-am: Makefile $(MANS) config.h
+all-am: Makefile $(MANS)
 installdirs: installdirs-recursive
 installdirs-am:
         for dir in "$(DESTDIR)$(man6dir)"; do \
@@ -760,7 +742,7 @@ clean-am: clean-generic mostlyclean-am
 distclean: distclean-recursive
         -rm -f $(am__CONFIG_DISTCLEAN_FILES)
         -rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-hdr distclean-tags
+distclean-am: clean-am distclean-generic distclean-tags
 
 dvi: dvi-recursive
 
@@ -824,23 +806,23 @@ uninstall-am: uninstall-man
 
 uninstall-man: uninstall-man6
 
-.MAKE: $(am__recursive_targets) all install-am install-strip
+.MAKE: $(am__recursive_targets) install-am install-strip
 
 .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
         am--refresh check check-am clean clean-cscope clean-generic \
         cscope cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \
         dist-gzip dist-lzip dist-shar dist-tarZ dist-xz dist-zip \
-        distcheck distclean distclean-generic distclean-hdr \
-        distclean-tags distcleancheck distdir distuninstallcheck dvi \
-        dvi-am html html-am info info-am install install-am \
-        install-data install-data-am install-dvi install-dvi-am \
-        install-exec install-exec-am install-html install-html-am \
-        install-info install-info-am install-man install-man6 \
-        install-pdf install-pdf-am install-ps install-ps-am \
-        install-strip installcheck installcheck-am installdirs \
-        installdirs-am maintainer-clean maintainer-clean-generic \
-        mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
-        tags-am uninstall uninstall-am uninstall-man uninstall-man6
+        distcheck distclean distclean-generic distclean-tags \
+        distcleancheck distdir distuninstallcheck dvi dvi-am html \
+        html-am info info-am install install-am install-data \
+        install-data-am install-dvi install-dvi-am install-exec \
+        install-exec-am install-html install-html-am install-info \
+        install-info-am install-man install-man6 install-pdf \
+        install-pdf-am install-ps install-ps-am install-strip \
+        installcheck installcheck-am installdirs installdirs-am \
+        maintainer-clean maintainer-clean-generic mostlyclean \
+        mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
+        uninstall-am uninstall-man uninstall-man6
 
 .PRECIOUS: Makefile
 
diff --git a/aclocal.m4 b/aclocal.m4
index f3018f6..df8ff83 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.15 -*- Autoconf -*-
+# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
 
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
 
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -20,7 +20,7 @@ You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically 'autoreconf'.])])
 
-# Copyright (C) 2002-2014 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -35,7 +35,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
 [am__api_version='1.15'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.15], [],
+m4_if([$1], [1.15.1], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -51,14 +51,14 @@ m4_define([_AM_AUTOCONF_VERSION], [])
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.15])dnl
+[AM_AUTOMAKE_VERSION([1.15.1])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -110,7 +110,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd`
 
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997-2014 Free Software Foundation, Inc.
+# Copyright (C) 1997-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -141,7 +141,7 @@ AC_CONFIG_COMMANDS_PRE(
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -332,7 +332,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
 
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -408,7 +408,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 
 # Do all the work for Automake.                             -*- Autoconf -*-
 
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -605,7 +605,7 @@ for _am_header in $config_headers :; do
 done
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -626,7 +626,7 @@ if test x"${install_sh+set}" != xset; then
 fi
 AC_SUBST([install_sh])])
 
-# Copyright (C) 2003-2014 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -647,7 +647,7 @@ AC_SUBST([am__leading_dot])])
 
 # Check to see how 'make' treats includes.                  -*- Autoconf -*-
 
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -697,7 +697,7 @@ rm -f confinc confmf
 
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# Copyright (C) 1997-2014 Free Software Foundation, Inc.
+# Copyright (C) 1997-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -736,7 +736,7 @@ fi
 
 # Helper functions for option handling.                     -*- Autoconf -*-
 
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -765,7 +765,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -812,7 +812,7 @@ AC_LANG_POP([C])])
 # For backward compatibility.
 AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
 
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -831,7 +831,7 @@ AC_DEFUN([AM_RUN_LOG],
 
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-
 
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -912,7 +912,7 @@ AC_CONFIG_COMMANDS_PRE(
 rm -f conftest.file
 ])
 
-# Copyright (C) 2009-2014 Free Software Foundation, Inc.
+# Copyright (C) 2009-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -972,7 +972,7 @@ AC_SUBST([AM_BACKSLASH])dnl
 _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
 ])
 
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1000,7 +1000,7 @@ fi
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
-# Copyright (C) 2006-2014 Free Software Foundation, Inc.
+# Copyright (C) 2006-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1019,7 +1019,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
 # Check how to create a tarball.                            -*- Autoconf -*-
 
-# Copyright (C) 2004-2014 Free Software Foundation, Inc.
+# Copyright (C) 2004-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff --git a/config.h.in b/config.h.in
deleted file mode 100644
index 56181f0..0000000
--- a/config.h.in
+++ /dev/null
@@ -1,70 +0,0 @@
-/* config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define to 1 if you have the `ncurses' library (-lncurses). */
-#undef HAVE_LIBNCURSES
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to 1 if you have the `memset' function. */
-#undef HAVE_MEMSET
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the `strtol' function. */
-#undef HAVE_STRTOL
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if typeof works with your compiler. */
-#undef HAVE_TYPEOF
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Name of package */
-#undef PACKAGE
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the home page for this package. */
-#undef PACKAGE_URL
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Version number of package */
-#undef VERSION
-
-/* Define to __typeof__ if your compiler spells it that way. */
-#undef typeof
diff --git a/configure b/configure
index b4680e9..a232794 100755
--- a/configure
+++ b/configure
@@ -2153,7 +2153,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-ac_config_headers="$ac_config_headers config.h"
+ac_config_headers="$ac_config_headers src/config.h"
 
 
 # Checks for programs.
@@ -5239,7 +5239,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 for ac_config_target in $ac_config_targets
 do
   case $ac_config_target in
-    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+    "src/config.h") CONFIG_HEADERS="$CONFIG_HEADERS src/config.h" ;;
     "docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;;
     "docs/life.6") CONFIG_FILES="$CONFIG_FILES docs/life.6" ;;
     "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
diff --git a/configure.ac b/configure.ac
index 4d8897a..0b1fffd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
 AC_PREREQ([2.69])
 AC_INIT([life], [1.6.0], [aiden.woodruff@gmail.com])
 AC_CONFIG_SRCDIR([src/life.c])
-AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_HEADERS([src/config.h])
 
 # Checks for programs.
 AC_PROG_CC
diff --git a/docs/Makefile.in b/docs/Makefile.in
index f7fcf82..f21a863 100644
--- a/docs/Makefile.in
+++ b/docs/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -92,7 +92,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
         $(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_HEADER = $(top_builddir)/src/config.h
 CONFIG_CLEAN_FILES = life.6
 CONFIG_CLEAN_VPATH_FILES =
 AM_V_P = $(am__v_P_@AM_V@)
diff --git a/src/Makefile.in b/src/Makefile.in
index 61cc02b..c7d1edc 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff --git a/src/life.c b/src/life.c
index 24117fa..e571c79 100644
--- a/src/life.c
+++ b/src/life.c
@@ -21,9 +21,9 @@
 
 #ifndef stat_bar_print
 // Print text to status bar in the nice way, without erasing or refreshing
-#define stat_bar_print(win,...)                                         \
-  mvwprintw(win, 0, 0, __VA_ARGS__);                                    \
-  for (int _i = getcurx(win); _i < getmaxx(win); _i++) waddch(win, ' ');
+#define stat_bar_print(win,...) do { \
+        mvwprintw(win, 0, 0, __VA_ARGS__);                                    \
+        mvwchgat(stat_bar, 0, 0, -1, A_STANDOUT, COLOR_PAIR(0), NULL); } while (0)
 #endif
 
 #ifndef CTRL
@@ -38,10 +38,10 @@ int main (int argc, char * argv[]) {
   int livecell = '#';
   int deadcell = '.';
   int timeout_val = 50;
-  int width = 36;
-  int height = 18;
-  int x = 0;
-  int y = 0;
+  size_t width = 36;
+  size_t height = 18;
+  size_t x = 0;
+  size_t y = 0;
   int playing = 0;
   int delaymax = 10;
   int delay = 0;
@@ -121,12 +121,12 @@ int main (int argc, char * argv[]) {
   keypad(rule_entry, RULE);
   keypad(board, TRUE);
   wstandout(stat_bar);
-  map = malloc((height * width)+1);
+  map = malloc(height * width + 1);
   memset(map, 0, height * width + 1);
   memset(map, deadcell, height * width);
-  x = width >> 2;
-  y = height >> 2;
-  while (ch != 'q') {
+  x = width >> 1; // width / 2
+  y = height >> 1; // height / 2
+  while (ch != 'q' && ch != 'Q') {
     foreach(werase, stdscr, board, stat_bar, entry);
     if (playing == FALSE) {
       // Numpad and arrow directions
@@ -202,9 +202,10 @@ int main (int argc, char * argv[]) {
         foreach(werase, stdscr, board, stat_bar, entry);
         stat_bar_print(stat_bar, "Press any key to return");
         print_copying_warranty(board);
-        foreach(wnoutrefresh, stdscr, entry, stat_bar);
+        foreach(wnoutrefresh, stdscr, entry, stat_bar, board);
         doupdate();
         getch();
+        foreach(werase, stdscr, board, stat_bar, board);
         wtimeout(board, timeout_val);
         break;
       case CTRL('r'):
@@ -237,10 +238,17 @@ int main (int argc, char * argv[]) {
       foreach(wclear, stdscr, entry, stat_bar, board);
     }
     for (int i = 0; i < height; ++i) {
-      mvwaddnstr(board, i, 0, map + (i * width), width);
+      mvwaddnstr(board, i, 0, (const char*) (map + (i * width)), width);
+      // *(map + (i * width) + x));
     }
-    mvwchgat(board, y, x, 1, A_STANDOUT, COLOR_PAIR(0), NULL);
-    stat_bar_print(stat_bar, "(%d, %d)\t\tGeneration: %d\t\tDelay Time: %d", x, y, generation, delaymax);
+    if (mvwchgat(board, y, x, 1, A_STANDOUT, COLOR_PAIR(0), NULL) == ERR) fprintf(stderr, "Error (mvwchgat)\n");
+
+    // Emulate tabs
+                mvwprintw(stat_bar, 0, 0, "(%d, %d)", x, y);
+                mvwprintw(stat_bar, 0, 12, "Generation: %d", generation);
+                mvwprintw(stat_bar, 0, 30, "Delay Time: %d", delaymax);
+                mvwchgat(stat_bar, 0, 0, -1, A_STANDOUT, COLOR_PAIR(0), NULL);
+
     foreach(wnoutrefresh, stdscr, board, entry, stat_bar);
     doupdate();
     if (playing == TRUE) {
@@ -252,14 +260,14 @@ int main (int argc, char * argv[]) {
       }
     }
     ch = wgetch(board);
-    ch = tolower(ch);
   }
+  endwin();
   foreach(werase, stdscr, board, stat_bar, entry, rule_entry, rule_entry_box);
   foreach(delwin, entry, stat_bar, board, rule_entry, rule_entry_box);
   board = stat_bar = entry = rule_entry = rule_entry_box = NULL;
-  endwin();
   delwin(stdscr);
   free(map);
   map = NULL;
+  fprintf(stdout, "Height: %zu\nWidth: %zu\n", height, width);
   return 0;
 }
diff --git a/test/Makefile.in b/test/Makefile.in
index 3036b0f..d5da6ad 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,