Updated changelog
Fixed CS