Changelog updated, some fixex #743, #689