Final changes and formatting.  This should be the last stuff..