Header issue fixed. Some additional minor tweaks.

3/21/2013