Minor formatting updates
Bug Fixes
Rackspace cleanup