Update/fix documentation

Including CHANGES