Numerous "under the hood" improvements