various fixes
merge with charlieMerge branch 'master' of github.com:SinDesignGC/SovereignEnergy