Add notes to changelog
Update TODO