reorder changelog.txt / FIXME