Improved performance, minor name tweaks