changelog and some cleaning