mostly cosmetic cleanups and getting the sources in line with the changes in the other libraries