update changelog and fix cs