Lots of changes and fixes, caught up to latest pixi dev commit