Update changelog and fine tune changes