Minor changes and fixes. It will be faster to read diff