TODOs and changelog updated