Bug fixes & Configuration

System wide bug fixes.  This commit also adds configuration data.