Update ChangeLog + minor cosmetic changes