Updated todos and changelog