Fix up some things, add xflux
Tweaking