Update CHANGELOG
Fix docs; Fix code.