Simplficiations, fix version number in changelog