stable sort order
update imports and versions