Minor Updates

Preparing for general consumption.