Update ChangeLog and cosmetic updates and fixes to manifests