Updated changelog and small adjust