diff --git a/arch/z16/src/z16f/z16f_serial.c b/arch/z16/src/z16f/z16f_serial.c
index 8dca7d03b9..aa3bdcb633 100644
--- a/arch/z16/src/z16f/z16f_serial.c
+++ b/arch/z16/src/z16f/z16f_serial.c
@@ -737,7 +737,7 @@ void up_earlyserialinit(void)
   uint8_t regval;
 
   /* Configure UART alternate pin functions.  This may duplicate logic in
-   * z16f_lowuartinit().
+   * z16f_lowuartinit() or z16f_lowinit().
    */
 
 #ifdef CONFIG_Z16F_UART0
diff --git a/configs/16z/src/z16f_lowinit.c b/configs/16z/src/z16f_lowinit.c
index b1a06810bd..7e2c64928b 100644
--- a/configs/16z/src/z16f_lowinit.c
+++ b/configs/16z/src/z16f_lowinit.c
@@ -44,7 +44,7 @@
 #include "chip/chip.h"
 
 /***************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ***************************************************************************/
 
 /***************************************************************************
@@ -100,6 +100,12 @@ static void z16f_extcsinit(void)
 
 /***************************************************************************
  * Name: z16f_gpioinit
+ *
+ * Description:
+ *   Configure board-specific GPIO usage here.  Driver pin configurations
+ *   are set in the associated device drivers (such as UART, SPI, I2C,
+ *   etc.) and must be preserved.
+ *
  ***************************************************************************/
 
 static void z16f_gpioinit(void)
diff --git a/configs/z16f2800100zcog/nsh/defconfig b/configs/z16f2800100zcog/nsh/defconfig
index 8a3612e817..6ba17d7807 100644
--- a/configs/z16f2800100zcog/nsh/defconfig
+++ b/configs/z16f2800100zcog/nsh/defconfig
@@ -7,6 +7,7 @@
 # Build Setup
 #
 # CONFIG_EXPERIMENTAL is not set
+# CONFIG_DEFAULT_SMALL is not set
 # CONFIG_HOST_LINUX is not set
 # CONFIG_HOST_OSX is not set
 CONFIG_HOST_WINDOWS=y
@@ -29,10 +30,12 @@ CONFIG_WINDOWS_CYGWIN=y
 # CONFIG_INTELHEX_BINARY is not set
 # CONFIG_MOTOROLA_SREC is not set
 # CONFIG_RAW_BINARY is not set
+# CONFIG_UBOOT_UIMAGE is not set
 
 #
 # Customize Header Files
 #
+# CONFIG_ARCH_STDINT_H is not set
 # CONFIG_ARCH_STDBOOL_H is not set
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
@@ -65,7 +68,9 @@ CONFIG_DEBUG=y
 # CONFIG_DEBUG_GPIO is not set
 # CONFIG_DEBUG_AUDIO is not set
 # CONFIG_DEBUG_SYMBOLS is not set
+# CONFIG_ARCH_HAVE_CUSTOMOPT is not set
 # CONFIG_DEBUG_NOOPT is not set
+CONFIG_DEBUG_FULLOPT=y
 
 #
 # System Type
@@ -100,6 +105,11 @@ CONFIG_ARCH_CHIP_Z16F=y
 #
 # Z16F Configuration Options
 #
+
+#
+# Z16F Peripheral Selection
+#
+# CONFIG_Z16F_ESPI is not set
 CONFIG_Z16F_UART0=y
 CONFIG_Z16F_UART1=y
 
@@ -113,9 +123,12 @@ CONFIG_ARCH_HAVE_IRQPRIO=y
 # CONFIG_CUSTOM_STACK is not set
 # CONFIG_ADDRENV is not set
 # CONFIG_ARCH_HAVE_VFORK is not set
+# CONFIG_ARCH_HAVE_MMU is not set
+# CONFIG_ARCH_NAND_HWECC is not set
 # CONFIG_ARCH_IRQPRIO is not set
 # CONFIG_ARCH_STACKDUMP is not set
 CONFIG_ENDIAN_BIG=y
+# CONFIG_ARCH_IDLE_CUSTOM is not set
 # CONFIG_ARCH_HAVE_RAMFUNCS is not set
 # CONFIG_ARCH_HAVE_RAMVECTORS is not set
 
@@ -145,10 +158,12 @@ CONFIG_BOOT_RUNFROMFLASH=y
 #
 CONFIG_RAM_START=0x0
 CONFIG_RAM_SIZE=65536
+# CONFIG_ARCH_HAVE_SDRAM is not set
 
 #
 # Board Selection
 #
+# CONFIG_ARCH_BOARD_16Z is not set
 CONFIG_ARCH_BOARD_Z16F2800100ZCOG=y
 # CONFIG_ARCH_BOARD_CUSTOM is not set
 CONFIG_ARCH_BOARD="z16f2800100zcog"
@@ -167,28 +182,6 @@ CONFIG_NSH_MMCSDMINOR=0
 #
 # RTOS Features
 #
-# CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
-# CONFIG_SYSTEM_TIME64 is not set
-CONFIG_RR_INTERVAL=200
-# CONFIG_SCHED_INSTRUMENTATION is not set
-CONFIG_TASK_NAME_SIZE=0
-# CONFIG_SCHED_HAVE_PARENT is not set
-# CONFIG_JULIAN_TIME is not set
-CONFIG_START_YEAR=2014
-CONFIG_START_MONTH=1
-CONFIG_START_DAY=1
-CONFIG_DEV_CONSOLE=y
-# CONFIG_MUTEX_TYPES is not set
-# CONFIG_PRIORITY_INHERITANCE is not set
-# CONFIG_FDCLONE_DISABLE is not set
-# CONFIG_FDCLONE_STDIO is not set
-CONFIG_SDCLONE_DISABLE=y
-CONFIG_SCHED_WAITPID=y
-# CONFIG_SCHED_STARTHOOK is not set
-# CONFIG_SCHED_ATEXIT is not set
-# CONFIG_SCHED_ONEXIT is not set
-CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
 # CONFIG_DISABLE_CLOCK is not set
 # CONFIG_DISABLE_POSIX_TIMERS is not set
@@ -197,6 +190,63 @@ CONFIG_DISABLE_OS_API=y
 # CONFIG_DISABLE_MQUEUE is not set
 # CONFIG_DISABLE_ENVIRON is not set
 
+#
+# Clocks and Timers
+#
+CONFIG_MSEC_PER_TICK=10
+# CONFIG_SYSTEM_TIME64 is not set
+# CONFIG_CLOCK_MONOTONIC is not set
+# CONFIG_JULIAN_TIME is not set
+CONFIG_START_YEAR=2014
+CONFIG_START_MONTH=1
+CONFIG_START_DAY=1
+CONFIG_MAX_WDOGPARMS=2
+CONFIG_PREALLOC_WDOGS=16
+CONFIG_PREALLOC_TIMERS=4
+
+#
+# Tasks and Scheduling
+#
+CONFIG_USER_ENTRYPOINT="nsh_main"
+CONFIG_RR_INTERVAL=200
+CONFIG_TASK_NAME_SIZE=0
+CONFIG_MAX_TASK_ARGS=4
+CONFIG_MAX_TASKS=16
+# CONFIG_SCHED_HAVE_PARENT is not set
+CONFIG_SCHED_WAITPID=y
+
+#
+# Pthread Options
+#
+# CONFIG_MUTEX_TYPES is not set
+CONFIG_NPTHREAD_KEYS=4
+
+#
+# Performance Monitoring
+#
+# CONFIG_SCHED_CPULOAD is not set
+# CONFIG_SCHED_INSTRUMENTATION is not set
+
+#
+# Files and I/O
+#
+CONFIG_DEV_CONSOLE=y
+# CONFIG_FDCLONE_DISABLE is not set
+# CONFIG_FDCLONE_STDIO is not set
+CONFIG_SDCLONE_DISABLE=y
+CONFIG_NFILE_DESCRIPTORS=8
+CONFIG_NFILE_STREAMS=8
+CONFIG_NAME_MAX=32
+# CONFIG_PRIORITY_INHERITANCE is not set
+
+#
+# RTOS hooks
+#
+# CONFIG_BOARD_INITIALIZE is not set
+# CONFIG_SCHED_STARTHOOK is not set
+# CONFIG_SCHED_ATEXIT is not set
+# CONFIG_SCHED_ONEXIT is not set
+
 #
 # Signal Numbers
 #
@@ -206,27 +256,18 @@ CONFIG_SIG_SIGALARM=3
 CONFIG_SIG_SIGCONDTIMEDOUT=16
 
 #
-# Sizes of configurable things (0 disables)
+# POSIX Message Queue Options
 #
-CONFIG_MAX_TASKS=16
-CONFIG_MAX_TASK_ARGS=4
-CONFIG_NPTHREAD_KEYS=4
-CONFIG_NFILE_DESCRIPTORS=8
-CONFIG_NFILE_STREAMS=8
-CONFIG_NAME_MAX=32
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_MQ_MAXMSGSIZE=32
-CONFIG_MAX_WDOGPARMS=2
-CONFIG_PREALLOC_WDOGS=16
-CONFIG_PREALLOC_TIMERS=4
 
 #
 # Stack and heap information
 #
-CONFIG_IDLETHREAD_STACKSIZE=4096
-CONFIG_USERMAIN_STACKSIZE=4096
+CONFIG_IDLETHREAD_STACKSIZE=1024
+CONFIG_USERMAIN_STACKSIZE=2048
 CONFIG_PTHREAD_STACK_MIN=256
-CONFIG_PTHREAD_STACK_DEFAULT=4096
+CONFIG_PTHREAD_STACK_DEFAULT=1536
 
 #
 # Device Drivers
@@ -245,6 +286,7 @@ CONFIG_DEV_NULL=y
 # CONFIG_I2S is not set
 # CONFIG_RTC is not set
 # CONFIG_WATCHDOG is not set
+# CONFIG_TIMER is not set
 # CONFIG_ANALOG is not set
 # CONFIG_AUDIO_DEVICES is not set
 # CONFIG_VIDEO_DEVICES is not set
@@ -261,8 +303,27 @@ CONFIG_DEV_NULL=y
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
 # CONFIG_16550_UART is not set
+# CONFIG_ARCH_HAVE_UART is not set
 CONFIG_ARCH_HAVE_UART0=y
 CONFIG_ARCH_HAVE_UART1=y
+# CONFIG_ARCH_HAVE_UART2 is not set
+# CONFIG_ARCH_HAVE_UART3 is not set
+# CONFIG_ARCH_HAVE_UART4 is not set
+# CONFIG_ARCH_HAVE_UART5 is not set
+# CONFIG_ARCH_HAVE_UART6 is not set
+# CONFIG_ARCH_HAVE_UART7 is not set
+# CONFIG_ARCH_HAVE_UART8 is not set
+# CONFIG_ARCH_HAVE_SCI0 is not set
+# CONFIG_ARCH_HAVE_SCI1 is not set
+# CONFIG_ARCH_HAVE_USART0 is not set
+# CONFIG_ARCH_HAVE_USART1 is not set
+# CONFIG_ARCH_HAVE_USART2 is not set
+# CONFIG_ARCH_HAVE_USART3 is not set
+# CONFIG_ARCH_HAVE_USART4 is not set
+# CONFIG_ARCH_HAVE_USART5 is not set
+# CONFIG_ARCH_HAVE_USART6 is not set
+# CONFIG_ARCH_HAVE_USART7 is not set
+# CONFIG_ARCH_HAVE_USART8 is not set
 
 #
 # USART Configuration
@@ -327,6 +388,7 @@ CONFIG_UART1_2STOP=0
 # File system configuration
 #
 # CONFIG_DISABLE_MOUNTPOINT is not set
+# CONFIG_DISABLE_PSEUDOFS_OPERATIONS is not set
 # CONFIG_FS_READABLE is not set
 # CONFIG_FS_WRITABLE is not set
 # CONFIG_FS_RAMMAP is not set
@@ -396,7 +458,7 @@ CONFIG_LIB_RAND_ORDER=1
 CONFIG_EOL_IS_EITHER_CRLF=y
 # CONFIG_LIBC_EXECFUNCS is not set
 CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=1024
-CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=2048
+CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536
 # CONFIG_LIBC_STRERROR is not set
 # CONFIG_LIBC_PERROR_STDOUT is not set
 CONFIG_ARCH_LOWPUTC=y
@@ -432,6 +494,7 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_BUTTONS is not set
 # CONFIG_EXAMPLES_CAN is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
+# CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
 # CONFIG_EXAMPLES_ELF is not set
 # CONFIG_EXAMPLES_FTPC is not set
@@ -442,7 +505,6 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_HIDKBD is not set
 # CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
-# CONFIG_EXAMPLES_LCDRW is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
 # CONFIG_EXAMPLES_MOUNT is not set
@@ -465,6 +527,8 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_ROMFS is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
+# CONFIG_EXAMPLES_SERIALBLASTER is not set
+# CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART_TEST is not set
@@ -499,14 +563,11 @@ CONFIG_EXAMPLES_NSH=y
 # Networking Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
-# CONFIG_NETUTILS_DHCPC is not set
 # CONFIG_NETUTILS_DHCPD is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_FTPD is not set
 # CONFIG_NETUTILS_JSON is not set
-# CONFIG_NETUTILS_DNSCLIENT is not set
 # CONFIG_NETUTILS_SMTP is not set
-# CONFIG_NETUTILS_TELNETD is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
 # CONFIG_NETUTILS_UIPLIB is not set
@@ -534,6 +595,7 @@ CONFIG_NSH_BUILTIN_APPS=y
 # CONFIG_NSH_DISABLE_CP is not set
 # CONFIG_NSH_DISABLE_CMP is not set
 # CONFIG_NSH_DISABLE_DD is not set
+# CONFIG_NSH_DISABLE_DF is not set
 # CONFIG_NSH_DISABLE_DELROUTE is not set
 # CONFIG_NSH_DISABLE_ECHO is not set
 # CONFIG_NSH_DISABLE_EXEC is not set
@@ -548,15 +610,12 @@ CONFIG_NSH_BUILTIN_APPS=y
 # CONFIG_NSH_DISABLE_LS is not set
 # CONFIG_NSH_DISABLE_MB is not set
 # CONFIG_NSH_DISABLE_MKDIR is not set
-# CONFIG_NSH_DISABLE_MKFATFS is not set
 # CONFIG_NSH_DISABLE_MKFIFO is not set
 # CONFIG_NSH_DISABLE_MKRD is not set
 # CONFIG_NSH_DISABLE_MH is not set
 # CONFIG_NSH_DISABLE_MOUNT is not set
 # CONFIG_NSH_DISABLE_MW is not set
-# CONFIG_NSH_DISABLE_NSFMOUNT is not set
 # CONFIG_NSH_DISABLE_PS is not set
-# CONFIG_NSH_DISABLE_PING is not set
 # CONFIG_NSH_DISABLE_PUT is not set
 # CONFIG_NSH_DISABLE_PWD is not set
 # CONFIG_NSH_DISABLE_RM is not set
@@ -579,16 +638,21 @@ CONFIG_NSH_CODECS_BUFSIZE=128
 # CONFIG_NSH_CMDOPT_HEXDUMP is not set
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=80
+# CONFIG_NSH_DISABLE_SEMICOLON is not set
+# CONFIG_NSH_CMDPARMS is not set
 CONFIG_NSH_MAXARGUMENTS=6
+# CONFIG_NSH_ARGCAT is not set
 CONFIG_NSH_NESTDEPTH=3
 # CONFIG_NSH_DISABLESCRIPT is not set
+# CONFIG_NSH_DISABLE_ITEF is not set
+# CONFIG_NSH_DISABLE_LOOPS is not set
 # CONFIG_NSH_DISABLEBG is not set
 CONFIG_NSH_CONSOLE=y
 
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+CONFIG_NSH_CONDEV="/dev/console"
 # CONFIG_NSH_ARCHINIT is not set
 
 #
@@ -601,15 +665,7 @@ CONFIG_NSH_CONSOLE=y
 # CONFIG_PLATFORM_CONFIGDATA is not set
 
 #
-# System NSH Add-Ons
-#
-
-#
-# USB CDC/ACM Device Commands
-#
-
-#
-# USB Composite Device Commands
+# System Libraries and NSH Add-Ons
 #
 
 #
@@ -618,8 +674,9 @@ CONFIG_NSH_CONSOLE=y
 # CONFIG_SYSTEM_FREE is not set
 
 #
-# I2C tool
+# EMACS-like Command Line Editor
 #
+# CONFIG_SYSTEM_CLE is not set
 
 #
 # FLASH Program Installation
@@ -630,6 +687,15 @@ CONFIG_NSH_CONSOLE=y
 # FLASH Erase-all Command
 #
 
+#
+# I2C tool
+#
+
+#
+# INI File Parser
+#
+# CONFIG_SYSTEM_INIFILE is not set
+
 #
 # NxPlayer media player library / command Line
 #
@@ -667,17 +733,30 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_SYSTEM_SYSINFO is not set
 
 #
-# USB Monitor
+# VI Work-Alike Editor
 #
+# CONFIG_SYSTEM_VI is not set
 
 #
 # Stack Monitor
 #
 
+#
+# USB CDC/ACM Device Commands
+#
+
+#
+# USB Composite Device Commands
+#
+
 #
 # USB Mass Storage Device Commands
 #
 
+#
+# USB Monitor
+#
+
 #
 # Zmodem Commands
 #
diff --git a/configs/z16f2800100zcog/src/z16f_lowinit.c b/configs/z16f2800100zcog/src/z16f_lowinit.c
index 2eb7d701ba..3b531f7b21 100644
--- a/configs/z16f2800100zcog/src/z16f_lowinit.c
+++ b/configs/z16f2800100zcog/src/z16f_lowinit.c
@@ -1,7 +1,7 @@
 /***************************************************************************
  * configs/z16f2800100zcog/src/z16f_lowinit.c
  *
- *   Copyright (C) 2008 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008, 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Based upon sample code included with the Zilog ZDS-II toolchain.
@@ -44,13 +44,23 @@
 #include "chip/chip.h"
 
 /***************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ***************************************************************************/
 
 /***************************************************************************
  * Private Functions
  ***************************************************************************/
 
+/***************************************************************************
+ * Name: z16f_gpioinit
+ *
+ * Description:
+ *   Configure board-specific GPIO usage here.  Driver pin configurations
+ *   are set in the associated device drivers (such as UART, SPI, I2C,
+ *   etc.) and must be preserved.
+ *
+ ***************************************************************************/
+
 static void z16f_gpioinit(void)
 {
   /* Configure LEDs and Run/Stop switch port */
@@ -72,11 +82,6 @@ static void z16f_gpioinit(void)
   /* Configure Direction switch port */
 
   putreg8(getreg8(Z16F_GPIOC_DD) | 0x01, Z16F_GPIOC_DD);
-
-  /* Configure to use both UART0 and 1 */
-
-  putreg8(getreg8(Z16F_GPIOA_AFL) | 0x30, Z16F_GPIOA_AFL);
-  putreg8(getreg8(Z16F_GPIOD_AFL) | 0x30, Z16F_GPIOD_AFL);
 }
 
 /***************************************************************************
@@ -87,4 +92,3 @@ void z16f_lowinit(void)
 {
   z16f_gpioinit();
 }
-