Pre B2 Updates

First batch of tweaks, generally cosmetics ... looks like we have some additional errors in the log that need to be fixed.