shift towards flux
a few fixes