A variety of changes and fixes.