Updated changelog and some more fixes