ChangeLog edits and TODOs

@vohi for your reading pleasure