todos and changelog updated