back last version from previous branch and edits
changelog and cleaning