minor tweaks and bug fixes.  Going to bed
Changed Database name to allow redeploying the server.